WL#6599 - New Data Dictionary and I_S integration.

This is a post-fix patch to fix test failures with NDB.
Following are the changes done,

- Ignore 'ndbinfo' schema to be exposed by I_S system views.

  schema 'ndbinfo' and its tables are hidden when ndb cluster
  engine is not running or system variable "show_hidden" (
  exported by ndb plugin) is not set.

  In 5.7, ha_find_files() is called to check if the 'ndbinfo' schema
  and its table are hidden or not.
  Similarly, CAN_ACCESS_* UDFs used by I_S system views are modified
  to ignore 'ndbinfo' schema and its tables if they are hidden by
  calling ha_find_files().

- Adjust test cases to mask ndb% tables from I_S queries in test
  cases.

Author: phulakun

mysql-test/r/dd_is_compatibility.result

@@ -150,7 +150,9 @@ table_name
 # 2. The view names in I_S.tables are in upper case.
 CREATE VIEW v1 AS SELECT table_name
 FROM information_schema.tables
-WHERE table_schema LIKE 'information_schema' AND table_name NOT LIKE 'INNODB%'
+WHERE table_schema LIKE 'information_schema'
+        AND table_name NOT LIKE 'INNODB%'
+        AND table_name NOT LIKE 'ndb%'
   ORDER BY table_name COLLATE UTF8_GENERAL_CI;
 SELECT * FROM v1;
 table_name

mysql-test/r/dd_is_compatibility_ci.result

@@ -150,7 +150,9 @@ table_name
 # 2. The view names in I_S.tables are in upper case.
 CREATE VIEW v1 AS SELECT table_name
 FROM information_schema.tables
-WHERE table_schema LIKE 'information_schema' AND table_name NOT LIKE 'INNODB%'
+WHERE table_schema LIKE 'information_schema'
+        AND table_name NOT LIKE 'INNODB%'
+        AND table_name NOT LIKE 'ndb%'
   ORDER BY table_name COLLATE UTF8_GENERAL_CI;
 SELECT * FROM v1;
 table_name

mysql-test/r/information_schema.result

@@ -313,11 +313,11 @@ explain select a.ROUTINE_NAME from information_schema.ROUTINES a,
 information_schema.SCHEMATA b where
 a.ROUTINE_SCHEMA = CONVERT(b.SCHEMA_NAME USING UTF8);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	#	NULL	index	PRIMARY	name	194	NULL	#	100.00	Using index
-1	SIMPLE	#	NULL	ALL	NULL	NULL	NULL	NULL	#	NULL	Using join buffer (Block Nested Loop)
-1	SIMPLE	#	NULL	ALL	catalog_id,default_collation_id	NULL	NULL	NULL	#	100.00	Using where; Using join buffer (Block Nested Loop)
-1	SIMPLE	#	NULL	eq_ref	PRIMARY,character_set_id	PRIMARY	8	mysql.sch.default_collation_id	#	100.00	NULL
-1	SIMPLE	#	NULL	eq_ref	PRIMARY	PRIMARY	8	mysql.col.character_set_id	#	100.00	Using index
+1	SIMPLE	#	NULL	index	PRIMARY	name	194	NULL	#	#	Using index
+1	SIMPLE	#	NULL	ALL	NULL	NULL	NULL	NULL	#	#	Using join buffer (Block Nested Loop)
+1	SIMPLE	#	NULL	ALL	catalog_id,default_collation_id	NULL	NULL	NULL	#	#	Using where; Using join buffer (Block Nested Loop)
+1	SIMPLE	#	NULL	eq_ref	PRIMARY,character_set_id	PRIMARY	8	mysql.sch.default_collation_id	#	#	NULL
+1	SIMPLE	#	NULL	eq_ref	PRIMARY	PRIMARY	8	mysql.col.character_set_id	#	#	Using index
 Warnings:
 Note	1003	#
 select count(*) from information_schema.ROUTINES where routine_schema='test';
@@ -382,10 +382,10 @@ sys
 test
 explain select * from v0;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	#	NULL	index	PRIMARY	name	194	NULL	1	100.00	Using index; Using temporary; Using filesort
-1	SIMPLE	#	NULL	ALL	catalog_id,default_collation_id	NULL	NULL	NULL	6	100.00	Using where; Using join buffer (Block Nested Loop)
-1	SIMPLE	#	NULL	eq_ref	PRIMARY,character_set_id	PRIMARY	8	mysql.sch.default_collation_id	1	100.00	NULL
-1	SIMPLE	#	NULL	eq_ref	PRIMARY	PRIMARY	8	mysql.col.character_set_id	1	100.00	Using index
+1	SIMPLE	#	NULL	index	PRIMARY	name	194	NULL	#	#	Using index; Using temporary; Using filesort
+1	SIMPLE	#	NULL	ALL	catalog_id,default_collation_id	NULL	NULL	NULL	#	#	Using where; Using join buffer (Block Nested Loop)
+1	SIMPLE	#	NULL	eq_ref	PRIMARY,character_set_id	PRIMARY	8	mysql.sch.default_collation_id	#	#	NULL
+1	SIMPLE	#	NULL	eq_ref	PRIMARY	PRIMARY	8	mysql.col.character_set_id	#	#	Using index
 Warnings:
 Note	1003	#
 create view v1 (c) as select table_name from information_schema.tables
@@ -2118,3 +2118,13 @@ disconnect con1;
 # Clean up.
 connection default;
 DROP VIEW v1;
+#
+# WL#6599: New Data Dictionary and I_S Integration.
+#
+# Test case to check if ndbinfo schema is listed by I_S when ndbcluster
+# is not running.
+#
+SELECT schema_name FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = 'ndbinfo';
+SCHEMA_NAME
+SELECT table_name FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'ndbinfo';
+TABLE_NAME

mysql-test/r/information_schema_ci.result

@@ -313,11 +313,11 @@ explain select a.ROUTINE_NAME from information_schema.ROUTINES a,
 information_schema.SCHEMATA b where
 a.ROUTINE_SCHEMA = CONVERT(b.SCHEMA_NAME USING UTF8);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	#	NULL	index	PRIMARY	name	194	NULL	#	100.00	Using index
-1	SIMPLE	#	NULL	ALL	NULL	NULL	NULL	NULL	#	NULL	Using join buffer (Block Nested Loop)
-1	SIMPLE	#	NULL	ALL	catalog_id,default_collation_id	NULL	NULL	NULL	#	100.00	Using where; Using join buffer (Block Nested Loop)
-1	SIMPLE	#	NULL	eq_ref	PRIMARY,character_set_id	PRIMARY	8	mysql.sch.default_collation_id	#	100.00	NULL
-1	SIMPLE	#	NULL	eq_ref	PRIMARY	PRIMARY	8	mysql.col.character_set_id	#	100.00	Using index
+1	SIMPLE	#	NULL	index	PRIMARY	name	194	NULL	#	#	Using index
+1	SIMPLE	#	NULL	ALL	NULL	NULL	NULL	NULL	#	#	Using join buffer (Block Nested Loop)
+1	SIMPLE	#	NULL	ALL	catalog_id,default_collation_id	NULL	NULL	NULL	#	#	Using where; Using join buffer (Block Nested Loop)
+1	SIMPLE	#	NULL	eq_ref	PRIMARY,character_set_id	PRIMARY	8	mysql.sch.default_collation_id	#	#	NULL
+1	SIMPLE	#	NULL	eq_ref	PRIMARY	PRIMARY	8	mysql.col.character_set_id	#	#	Using index
 Warnings:
 Note	1003	#
 select count(*) from information_schema.ROUTINES where routine_schema='test';
@@ -382,10 +382,10 @@ sys
 test
 explain select * from v0;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	#	NULL	index	PRIMARY	name	194	NULL	1	100.00	Using index; Using temporary; Using filesort
-1	SIMPLE	#	NULL	ALL	catalog_id,default_collation_id	NULL	NULL	NULL	6	100.00	Using where; Using join buffer (Block Nested Loop)
-1	SIMPLE	#	NULL	eq_ref	PRIMARY,character_set_id	PRIMARY	8	mysql.sch.default_collation_id	1	100.00	NULL
-1	SIMPLE	#	NULL	eq_ref	PRIMARY	PRIMARY	8	mysql.col.character_set_id	1	100.00	Using index
+1	SIMPLE	#	NULL	index	PRIMARY	name	194	NULL	#	#	Using index; Using temporary; Using filesort
+1	SIMPLE	#	NULL	ALL	catalog_id,default_collation_id	NULL	NULL	NULL	#	#	Using where; Using join buffer (Block Nested Loop)
+1	SIMPLE	#	NULL	eq_ref	PRIMARY,character_set_id	PRIMARY	8	mysql.sch.default_collation_id	#	#	NULL
+1	SIMPLE	#	NULL	eq_ref	PRIMARY	PRIMARY	8	mysql.col.character_set_id	#	#	Using index
 Warnings:
 Note	1003	#
 create view v1 (c) as select table_name from information_schema.tables
@@ -2118,3 +2118,13 @@ disconnect con1;
 # Clean up.
 connection default;
 DROP VIEW v1;
+#
+# WL#6599: New Data Dictionary and I_S Integration.
+#
+# Test case to check if ndbinfo schema is listed by I_S when ndbcluster
+# is not running.
+#
+SELECT schema_name FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = 'ndbinfo';
+SCHEMA_NAME
+SELECT table_name FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'ndbinfo';
+TABLE_NAME

mysql-test/suite/ndbcluster/basic.result

@@ -27,3 +27,42 @@ b
 MySQL Server with NDB test
 DELETE FROM t1 ORDER BY b DESC;
 DROP TABLE t1;
+#
+# WL#6599: New Data Dictionary and I_S Integration.
+#
+# Test case to check if ndbinfo schema is listed by I_S when ndbcluster
+# is running.
+#
+SELECT schema_name FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = 'ndbinfo';
+SCHEMA_NAME
+ndbinfo
+SELECT table_name FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'ndbinfo';
+TABLE_NAME
+arbitrator_validity_detail
+arbitrator_validity_summary
+blocks
+cluster_operations
+cluster_transactions
+config_params
+config_values
+counters
+dict_obj_types
+disk_write_speed_aggregate
+disk_write_speed_aggregate_node
+disk_write_speed_base
+diskpagebuffer
+logbuffers
+logspaces
+membership
+memory_per_fragment
+memoryusage
+nodes
+operations_per_fragment
+resources
+restart_info
+server_operations
+server_transactions
+tc_time_track_stats
+threadblocks
+threadstat
+transporters

mysql-test/suite/ndbcluster/basic.test

@@ -25,3 +25,15 @@ SELECT COUNT(*) FROM t1;
 SELECT b FROM t1 WHERE b LIKE "MySQL%";
 DELETE FROM t1 ORDER BY b DESC;
 DROP TABLE t1;
+
+
+--echo #
+--echo # WL#6599: New Data Dictionary and I_S Integration.
+--echo #
+--echo # Test case to check if ndbinfo schema is listed by I_S when ndbcluster
+--echo # is running.
+--echo #
+#'ndbinfo' schema should be listed when ndbcluster is running.
+SELECT schema_name FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = 'ndbinfo';
+# tables of ndbinfo schema should be listed.
+SELECT table_name FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'ndbinfo';

mysql-test/suite/ndbcluster/binlog_index_table.result

@@ -4,7 +4,8 @@ TABLE_SCHEMA	TABLE_NAME
 mysql	ndb_binlog_index
 select ORDINAL_POSITION, COLUMN_NAME, COLUMN_TYPE, COLUMN_DEFAULT,
 IS_NULLABLE from information_schema.columns
-where TABLE_SCHEMA = 'mysql' and TABLE_NAME = 'ndb_binlog_index';
+where TABLE_SCHEMA = 'mysql' and TABLE_NAME = 'ndb_binlog_index'
+  order by ORDINAL_POSITION;
 ORDINAL_POSITION	COLUMN_NAME	COLUMN_TYPE	COLUMN_DEFAULT	IS_NULLABLE
 1	Position	bigint(20) unsigned	NULL	NO
 2	File	varchar(255)	NULL	NO

mysql-test/suite/ndbcluster/binlog_index_table.test

@@ -21,5 +21,6 @@ select TABLE_SCHEMA, TABLE_NAME from information_schema.tables
 #
 select ORDINAL_POSITION, COLUMN_NAME, COLUMN_TYPE, COLUMN_DEFAULT,
        IS_NULLABLE from information_schema.columns
-  where TABLE_SCHEMA = 'mysql' and TABLE_NAME = 'ndb_binlog_index';
+  where TABLE_SCHEMA = 'mysql' and TABLE_NAME = 'ndb_binlog_index'
+  order by ORDINAL_POSITION;
 

mysql-test/t/component-upgrade.test

@@ -20,6 +20,9 @@ CALL mtr.add_suppression("The mysql.component table is missing or has an incorre
 # Basic test that we can run mysql_upgrde and that it finds the expected
 # binaries it uses.
 --echo Run mysql_upgrade once
+# Filter out ndb_binlog_index to mask differences due to running with or without
+# ndb.
+--replace_regex /mysql.ndb_binlog_index.*$//
 --exec $MYSQL_UPGRADE --skip-verbose --force 2>&1
 
 # It should have created a file in the MySQL Servers datadir
@@ -38,6 +41,9 @@ DROP TABLE mysql.component;
 --enable_reconnect
 --source include/wait_until_connected_again.inc
 --echo # running mysql_upgrade
+# Filter out ndb_binlog_index to mask differences due to running with or without
+# ndb.
+--replace_regex /mysql.ndb_binlog_index.*$//
 --exec $MYSQL_UPGRADE --skip-verbose --force 2>&1
 --source include/have_example_component.inc
 INSTALL COMPONENT "file://component_example_component1";

mysql-test/t/dd_is_compatibility.test

@@ -157,7 +157,9 @@ SELECT table_name AS 'table_name'
 
 CREATE VIEW v1 AS SELECT table_name
   FROM information_schema.tables
-  WHERE table_schema LIKE 'information_schema' AND table_name NOT LIKE 'INNODB%'
+  WHERE table_schema LIKE 'information_schema'
+        AND table_name NOT LIKE 'INNODB%'
+        AND table_name NOT LIKE 'ndb%'
   ORDER BY table_name COLLATE UTF8_GENERAL_CI;
 SELECT * FROM v1;
 DROP VIEW v1;

mysql-test/t/information_schema.test

@@ -179,7 +179,7 @@ show function status where db='test';
 select a.ROUTINE_NAME from information_schema.ROUTINES a,
 information_schema.SCHEMATA b where
 a.ROUTINE_SCHEMA = CONVERT(b.SCHEMA_NAME USING UTF8) AND b.SCHEMA_NAME='test';
---replace_column 3 # 10 #
+--replace_column 3 # 10 # 11 #
 explain select a.ROUTINE_NAME from information_schema.ROUTINES a,
 information_schema.SCHEMATA b where
 a.ROUTINE_SCHEMA = CONVERT(b.SCHEMA_NAME USING UTF8);
@@ -222,7 +222,7 @@ show create procedure sel2;
 #
 create view v0 (c) as select schema_name from information_schema.schemata order by schema_name;
 select * from v0;
---replace_column 3 #
+--replace_column 3 # 10 # 11 #
 explain select * from v0;
 create view v1 (c) as select table_name from information_schema.tables
 where table_name="v1" order by table_name;
@@ -1946,3 +1946,15 @@ disconnect con1;
 connection default;
 DROP VIEW v1;
 --disable_connect_log
+
+
+--echo #
+--echo # WL#6599: New Data Dictionary and I_S Integration.
+--echo #
+--echo # Test case to check if ndbinfo schema is listed by I_S when ndbcluster
+--echo # is not running.
+--echo #
+#'ndbinfo' schema should not be listed when ndbcluster is not running.
+SELECT schema_name FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = 'ndbinfo';
+# tables of ndbinfo schema should not be listed.
+SELECT table_name FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'ndbinfo';

mysql-test/t/roles-upgrade.test

@@ -6,6 +6,9 @@
 # expected binaries it uses.
 #
 --echo Run mysql_upgrade once
+# Filter out ndb_binlog_index to mask differences due to running with or without
+# ndb.
+--replace_regex /mysql.ndb_binlog_index.*$//
 --exec $MYSQL_UPGRADE --skip-verbose --force 2>&1
 
 # It should have created a file in the MySQL Servers datadir
@@ -45,6 +48,9 @@ CREATE ROLE r1;
 GRANT SELECT ON *.* TO u1;
 
 --echo # Run mysql_upgrade
+# Filter out ndb_binlog_index to mask differences due to running with or without
+# ndb.
+--replace_regex /mysql.ndb_binlog_index.*$//
 --exec $MYSQL_UPGRADE --skip-verbose --force 2>&1
 
 SHOW CREATE TABLE mysql.role_edges;

sql/dd/info_schema/stats.cc

@@ -164,7 +164,7 @@ bool convert_table_name_case(char *db, char *table_name)
   if (db && is_infoschema_db(db))
   {
     my_casedn_str(system_charset_info, db);
-    if (table_name)
+    if (table_name && strncmp(table_name, "ndb", 3))
         my_caseup_str(system_charset_info, table_name);
 
     return true;