WL#6391: Post-push fix.

This patch fixes two test failures:

1. dd_bootstrap_debug fails on case insensitive file systems
   due to an insufficient WHERE clause after the push of
   WL#6599, since the table table 'schemata' now will match
   both 'mysql.schemata' and 'information_schema.SCHEMATA'.

2. dd_schema_definition_debug_c[si] fails due to differences
   in the way the mysqltest works for embedded servers when
   it evaluates mtr commands in the test. It seems like
   setting the SESSION debug variable has no effect on certain
   commands, whereas setting the GLOBAL debug variable works.

Author: ssorumgard

mysql-test/include/dd_schema_definition_debug.inc

@@ -11,7 +11,7 @@
 
 use mysql;
 
-SET SESSION debug= '+d,skip_dd_table_access_check';
+SET GLOBAL debug= '+d,skip_dd_table_access_check';
 
 # The DD database id
 let $dd_schema_id= `SELECT id FROM schemata
@@ -80,4 +80,4 @@ eval SELECT * FROM index_column_usage
   WHERE index_id IN ($dd_index_ids)
   ORDER BY index_id, column_id;
 
-SET SESSION debug= '-d,skip_dd_table_access_check';
+SET GLOBAL debug= '-d,skip_dd_table_access_check';

mysql-test/r/dd_bootstrap_debug.result

@@ -45,7 +45,10 @@
 # 4.4 Connect as root.
 # 4.5 Verify that the modified table is present.
 SET SESSION debug= '+d,skip_dd_table_access_check';
-SELECT comment FROM mysql.tables WHERE name='schemata';
+SELECT t.comment FROM mysql.tables AS t, mysql.schemata AS s WHERE
+t.name = 'schemata' AND
+t.schema_id = s.id AND
+s.name = 'mysql';
 comment
 Altered table
 SET SESSION debug= '-d,skip_dd_table_access_check';

mysql-test/r/dd_schema_definition_debug_ci.result

@@ -1,5 +1,5 @@
 use mysql;
-SET SESSION debug= '+d,skip_dd_table_access_check';
+SET GLOBAL debug= '+d,skip_dd_table_access_check';
 #
 # Subset of definitions from tables, not including
 # timestamps, partitioning, view definitions and
@@ -447,4 +447,4 @@ index_id	ordinal_position	column_id	length	order	hidden
 81	1	281	8	ASC	0
 82	1	282	192	ASC	0
 83	1	283	8	ASC	0
-SET SESSION debug= '-d,skip_dd_table_access_check';
+SET GLOBAL debug= '-d,skip_dd_table_access_check';

mysql-test/r/dd_schema_definition_debug_cs.result

@@ -1,5 +1,5 @@
 use mysql;
-SET SESSION debug= '+d,skip_dd_table_access_check';
+SET GLOBAL debug= '+d,skip_dd_table_access_check';
 #
 # Subset of definitions from tables, not including
 # timestamps, partitioning, view definitions and
@@ -447,4 +447,4 @@ index_id	ordinal_position	column_id	length	order	hidden
 81	1	281	8	ASC	0
 82	1	282	192	ASC	0
 83	1	283	8	ASC	0
-SET SESSION debug= '-d,skip_dd_table_access_check';
+SET GLOBAL debug= '-d,skip_dd_table_access_check';

mysql-test/t/dd_bootstrap_debug.test

@@ -190,7 +190,10 @@ connect(root_con,localhost,root,,mysql);
 
 --echo # 4.5 Verify that the modified table is present.
 SET SESSION debug= '+d,skip_dd_table_access_check';
-SELECT comment FROM mysql.tables WHERE name='schemata';
+SELECT t.comment FROM mysql.tables AS t, mysql.schemata AS s WHERE
+  t.name = 'schemata' AND
+  t.schema_id = s.id AND
+  s.name = 'mysql';
 SET SESSION debug= '-d,skip_dd_table_access_check';
 
 --echo # 4.6 Shut server down.