WL#6599 - New Data Dictionary and I_S integration.

This is a post-push patch to fix test failures with NDB on
embedded server.

The changes made to ignore 'ndbinfo' and its tables when ndb
cluster is not running or system variable "show_hidden"(exported
by NDB)is not set, are compiled out for the embedded server.
Hence on embedded server with NDB plugin, schema 'ndbinfo'
and its tables are listed always. This caused extra test
failures on embedded server with NDB.

To fix this issue, including the changes made to ignore
'ndbinfo' schema and test tables for embedded server too.

Author: phulakun

sql/item_func.cc

@@ -9172,7 +9172,6 @@ longlong Item_func_can_access_database::val_int()
   DBUG_ENTER("Item_func_can_access_database::val_int");
   bool have_access= true;
 
-#ifndef NO_EMBEDDED_ACCESS_CHECKS
   // Read schema_name
   String schema_name;
   String *schema_name_ptr;
@@ -9181,15 +9180,16 @@ longlong Item_func_can_access_database::val_int()
     // Make sure we have safe string to access.
     schema_name_ptr->c_ptr_safe();
 
-    // Skip INFORMATION_SCHEMA database
-    if (is_infoschema_db(schema_name_ptr->ptr()))
-      DBUG_RETURN(true);
-
     // Check if schema is hidden.
     THD *thd= current_thd;
     if (is_hidden_by_ndb(thd, schema_name_ptr, nullptr))
       DBUG_RETURN(false);
 
+#ifndef NO_EMBEDDED_ACCESS_CHECKS
+    // Skip INFORMATION_SCHEMA database
+    if (is_infoschema_db(schema_name_ptr->ptr()))
+      DBUG_RETURN(true);
+
     // Check access
     Security_context *sctx= thd->security_context();
     if (!(sctx->master_access() & (DB_ACLS | SHOW_DB_ACL) ||
@@ -9200,8 +9200,8 @@ longlong Item_func_can_access_database::val_int()
     {
       have_access= false;
     }
-  }
 #endif
+  }
 
   DBUG_RETURN(have_access);
 }
@@ -9224,7 +9224,6 @@ longlong Item_func_can_access_table::val_int()
   DBUG_ENTER("Item_func_can_access_table::val_int");
   bool have_access= true;
 
-#ifndef NO_EMBEDDED_ACCESS_CHECKS
   // Read schema_name, table_name
   String schema_name;
   String *schema_name_ptr;
@@ -9237,15 +9236,16 @@ longlong Item_func_can_access_table::val_int()
     schema_name_ptr->c_ptr_safe();
     table_name_ptr->c_ptr_safe();
 
-    // Skip INFORMATION_SCHEMA database
-    if (is_infoschema_db(schema_name_ptr->ptr()))
-      DBUG_RETURN(true);
-
     // Check if table is hidden.
     THD *thd= current_thd;
     if (is_hidden_by_ndb(thd, schema_name_ptr, table_name_ptr))
       DBUG_RETURN(false);
 
+#ifndef NO_EMBEDDED_ACCESS_CHECKS
+    // Skip INFORMATION_SCHEMA database
+    if (is_infoschema_db(schema_name_ptr->ptr()))
+      DBUG_RETURN(true);
+
     // Check access
     ulong db_access= 0;
     check_access(thd, SELECT_ACL, schema_name_ptr->ptr(),
@@ -9267,8 +9267,8 @@ longlong Item_func_can_access_table::val_int()
         have_access= false;
       }
     }
-  }
 #endif
+  }
 
   DBUG_RETURN(have_access);
 }
@@ -9293,32 +9293,36 @@ longlong Item_func_can_access_column::val_int()
   DBUG_ENTER("Item_func_can_access_column::val_int");
   bool have_access= true;
 
-#ifndef NO_EMBEDDED_ACCESS_CHECKS
   // Read schema_name, table_name
   String schema_name;
   String *schema_name_ptr;
   String table_name;
   String *table_name_ptr;
-  String column_name;
-  String *column_name_ptr;
   if ((schema_name_ptr=args[0]->val_str(&schema_name)) != nullptr &&
-      (table_name_ptr=args[1]->val_str(&table_name)) != nullptr &&
-      (column_name_ptr=args[2]->val_str(&column_name)) != nullptr)
+      (table_name_ptr=args[1]->val_str(&table_name)) != nullptr)
   {
     // Make sure we have safe string to access.
     schema_name_ptr->c_ptr_safe();
     table_name_ptr->c_ptr_safe();
-    column_name_ptr->c_ptr_safe();
-
-    // Skip INFORMATION_SCHEMA database
-    if (is_infoschema_db(schema_name_ptr->ptr()))
-      DBUG_RETURN(true);
 
     // Check if table is hidden.
     THD *thd= current_thd;
     if (is_hidden_by_ndb(thd, schema_name_ptr, table_name_ptr))
       DBUG_RETURN(false);
 
+#ifndef NO_EMBEDDED_ACCESS_CHECKS
+    // Read column_name.
+    String column_name;
+    String *column_name_ptr;
+    if ((column_name_ptr=args[2]->val_str(&column_name)) == nullptr)
+      DBUG_RETURN(true);
+    // Make sure we have safe string to access.
+    column_name_ptr->c_ptr_safe();
+
+    // Skip INFORMATION_SCHEMA database
+    if (is_infoschema_db(schema_name_ptr->ptr()))
+      DBUG_RETURN(true);
+
     // Check access
     GRANT_INFO grant_info;
     memset(&grant_info, 0, sizeof (grant_info));
@@ -9334,8 +9338,8 @@ longlong Item_func_can_access_column::val_int()
     {
       have_access= false;
     }
-  }
 #endif
+  }
 
   DBUG_RETURN(have_access);
 }