Merge of fix for Bug 42836 into GCA tree

mysql-test/suite/funcs_1/r/innodb_trig_0102.result

@@ -348,13 +348,13 @@ for each row set @test_var2='trig1_a';
 create trigger trig_db2.trig2 before insert on trig_db2.t1
 for each row set @test_var3='trig2';
 select trigger_schema, trigger_name, event_object_table
-from information_schema.triggers order by trigger_name;
+from information_schema.triggers
+where trigger_schema like 'trig_db%'
+        order by trigger_name;
 trigger_schema	trigger_name	event_object_table
-mtr	gs_insert	global_suppressions
 trig_db1	trig1_a	t1
 trig_db1	trig1_b	t1
 trig_db2	trig2	t1
-mtr	ts_insert	test_suppressions
 set @test_var1= '', @test_var2= '', @test_var3= '';
 insert into t1 (f1,f2) values ('insert to db1 t1 from db1',352);
 insert into trig_db2.t1 (f1,f2) values ('insert to db2 t1 from db1',352);

mysql-test/suite/funcs_1/r/innodb_trig_0407.result

@@ -90,10 +90,10 @@ f1
 Trigger 3.5.4.1
 drop trigger trg1;
 select trigger_schema, trigger_name, event_object_table
-from information_schema.triggers order by trigger_name;
+from information_schema.triggers
+where trigger_schema = 'db_drop'
+        order by trigger_name;
 trigger_schema	trigger_name	event_object_table
-mtr	gs_insert	global_suppressions
-mtr	ts_insert	test_suppressions
 Insert into t1 values ('Insert no trigger 3.5.4.1');
 Select * from t1 order by f1;
 f1
@@ -151,12 +151,8 @@ Select * from t1;
 f1
 Trigger 3.5.4.4
 Drop database db_drop4;
-Show databases;
-Database
-information_schema
-mtr
-mysql
-test
+Show databases like 'db_drop4';
+Database (db_drop4)
 select trigger_schema, trigger_name, event_object_table
 from information_schema.triggers
 where information_schema.triggers.trigger_name='trg4';

mysql-test/suite/funcs_1/r/memory_trig_0102.result

@@ -349,13 +349,13 @@ for each row set @test_var2='trig1_a';
 create trigger trig_db2.trig2 before insert on trig_db2.t1
 for each row set @test_var3='trig2';
 select trigger_schema, trigger_name, event_object_table
-from information_schema.triggers order by trigger_name;
+from information_schema.triggers
+where trigger_schema like 'trig_db%'
+        order by trigger_name;
 trigger_schema	trigger_name	event_object_table
-mtr	gs_insert	global_suppressions
 trig_db1	trig1_a	t1
 trig_db1	trig1_b	t1
 trig_db2	trig2	t1
-mtr	ts_insert	test_suppressions
 set @test_var1= '', @test_var2= '', @test_var3= '';
 insert into t1 (f1,f2) values ('insert to db1 t1 from db1',352);
 insert into trig_db2.t1 (f1,f2) values ('insert to db2 t1 from db1',352);

mysql-test/suite/funcs_1/r/memory_trig_0407.result

@@ -91,10 +91,10 @@ f1
 Trigger 3.5.4.1
 drop trigger trg1;
 select trigger_schema, trigger_name, event_object_table
-from information_schema.triggers order by trigger_name;
+from information_schema.triggers
+where trigger_schema = 'db_drop'
+        order by trigger_name;
 trigger_schema	trigger_name	event_object_table
-mtr	gs_insert	global_suppressions
-mtr	ts_insert	test_suppressions
 Insert into t1 values ('Insert no trigger 3.5.4.1');
 Select * from t1 order by f1;
 f1
@@ -152,12 +152,8 @@ Select * from t1;
 f1
 Trigger 3.5.4.4
 Drop database db_drop4;
-Show databases;
-Database
-information_schema
-mtr
-mysql
-test
+Show databases like 'db_drop4';
+Database (db_drop4)
 select trigger_schema, trigger_name, event_object_table
 from information_schema.triggers
 where information_schema.triggers.trigger_name='trg4';

mysql-test/suite/funcs_1/r/myisam_trig_0102.result

@@ -349,13 +349,13 @@ for each row set @test_var2='trig1_a';
 create trigger trig_db2.trig2 before insert on trig_db2.t1
 for each row set @test_var3='trig2';
 select trigger_schema, trigger_name, event_object_table
-from information_schema.triggers order by trigger_name;
+from information_schema.triggers
+where trigger_schema like 'trig_db%'
+        order by trigger_name;
 trigger_schema	trigger_name	event_object_table
-mtr	gs_insert	global_suppressions
 trig_db1	trig1_a	t1
 trig_db1	trig1_b	t1
 trig_db2	trig2	t1
-mtr	ts_insert	test_suppressions
 set @test_var1= '', @test_var2= '', @test_var3= '';
 insert into t1 (f1,f2) values ('insert to db1 t1 from db1',352);
 insert into trig_db2.t1 (f1,f2) values ('insert to db2 t1 from db1',352);

mysql-test/suite/funcs_1/r/myisam_trig_0407.result

@@ -91,10 +91,10 @@ f1
 Trigger 3.5.4.1
 drop trigger trg1;
 select trigger_schema, trigger_name, event_object_table
-from information_schema.triggers order by trigger_name;
+from information_schema.triggers
+where trigger_schema = 'db_drop'
+        order by trigger_name;
 trigger_schema	trigger_name	event_object_table
-mtr	gs_insert	global_suppressions
-mtr	ts_insert	test_suppressions
 Insert into t1 values ('Insert no trigger 3.5.4.1');
 Select * from t1 order by f1;
 f1
@@ -152,12 +152,8 @@ Select * from t1;
 f1
 Trigger 3.5.4.4
 Drop database db_drop4;
-Show databases;
-Database
-information_schema
-mtr
-mysql
-test
+Show databases like 'db_drop4';
+Database (db_drop4)
 select trigger_schema, trigger_name, event_object_table
 from information_schema.triggers
 where information_schema.triggers.trigger_name='trg4';

mysql-test/suite/funcs_1/r/ndb_trig_0102.result

@@ -348,13 +348,13 @@ for each row set @test_var2='trig1_a';
 create trigger trig_db2.trig2 before insert on trig_db2.t1
 for each row set @test_var3='trig2';
 select trigger_schema, trigger_name, event_object_table
-from information_schema.triggers order by trigger_name;
+from information_schema.triggers
+where trigger_schema like 'trig_db%'
+        order by trigger_name;
 trigger_schema	trigger_name	event_object_table
-mtr	gs_insert	global_suppressions
 trig_db1	trig1_a	t1
 trig_db1	trig1_b	t1
 trig_db2	trig2	t1
-mtr	ts_insert	test_suppressions
 set @test_var1= '', @test_var2= '', @test_var3= '';
 insert into t1 (f1,f2) values ('insert to db1 t1 from db1',352);
 insert into trig_db2.t1 (f1,f2) values ('insert to db2 t1 from db1',352);

mysql-test/suite/funcs_1/r/ndb_trig_0407.result

@@ -90,10 +90,10 @@ f1
 Trigger 3.5.4.1
 drop trigger trg1;
 select trigger_schema, trigger_name, event_object_table
-from information_schema.triggers order by trigger_name;
+from information_schema.triggers
+where trigger_schema = 'db_drop'
+        order by trigger_name;
 trigger_schema	trigger_name	event_object_table
-mtr	gs_insert	global_suppressions
-mtr	ts_insert	test_suppressions
 Insert into t1 values ('Insert no trigger 3.5.4.1');
 Select * from t1 order by f1;
 f1
@@ -151,12 +151,8 @@ Select * from t1;
 f1
 Trigger 3.5.4.4
 Drop database db_drop4;
-Show databases;
-Database
-information_schema
-mtr
-mysql
-test
+Show databases like 'db_drop4';
+Database (db_drop4)
 select trigger_schema, trigger_name, event_object_table
 from information_schema.triggers
 where information_schema.triggers.trigger_name='trg4';

mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc

@@ -2,15 +2,14 @@
 #
 #  used from .../storedproc_08.inc to show all created / altered routines
 
-let $message= ... now check what is stored:;
---source include/show_msg.inc
+--echo
+--echo ... now check what is stored:
+--echo -----------------------------
 
 --vertical_results
 
-#--replace_column 16 "YYYY-MM-DD hh:mm:ss" 17 "YYYY-MM-DD hh:mm:ss"
-
 --replace_column 16 <modified> 17 <created>
-SELECT * FROM information_schema.routines;
+SELECT * FROM information_schema.routines where routine_schema = 'db_storedproc';
 
 
 SHOW CREATE FUNCTION  fn_1;

mysql-test/suite/funcs_1/t/storedproc.test

@@ -72,7 +72,7 @@ delimiter ;//
 CALL sp1_thisisaveryverylongname234872934_thisisaveryverylongnameabcde( 'abc' );
 
 --replace_column 5 <modified> 6 <created>
-SHOW PROCEDURE STATUS;
+SHOW PROCEDURE STATUS WHERE db = 'db_storedproc';
 
 --disable_warnings
 DROP PROCEDURE IF EXISTS sp1;
@@ -90,7 +90,7 @@ delimiter ;//
 CALL sp1( 34 );
 
 --replace_column 5 <modified> 6 <created>
-SHOW PROCEDURE STATUS;
+SHOW PROCEDURE STATUS WHERE db = 'db_storedproc';
 
 --disable_warnings
 DROP PROCEDURE IF EXISTS sp1;
@@ -108,7 +108,7 @@ delimiter ;//
 CALL sp1( 34 );
 
 --replace_column 5 <modified> 6 <created>
-SHOW PROCEDURE STATUS;
+SHOW PROCEDURE STATUS WHERE db = 'db_storedproc';
 
 --disable_warnings
 DROP PROCEDURE IF EXISTS sp1;
@@ -126,7 +126,7 @@ delimiter ;//
 CALL sp1( 34 );
 
 --replace_column 5 <modified> 6 <created>
-SHOW PROCEDURE STATUS;
+SHOW PROCEDURE STATUS WHERE db = 'db_storedproc';
 
 --disable_warnings
 DROP PROCEDURE IF EXISTS sp1;
@@ -191,9 +191,9 @@ BEGIN
 END//
 delimiter ;//
 --replace_column 5 <modified> 6 <created>
-SHOW PROCEDURE STATUS;
+SHOW PROCEDURE STATUS WHERE db = 'db_storedproc';
 --replace_column 5 <modified> 6 <created>
-SHOW FUNCTION STATUS;
+SHOW FUNCTION STATUS WHERE db = 'db_storedproc';
 
 let $test_value = 1.7976931348623157493578e+308;
 --source suite/funcs_1/storedproc/param_check.inc
@@ -245,7 +245,7 @@ delimiter ;//
 CALL sp1( "value1" );
 
 --replace_column 5 <modified> 6 <created>
-SHOW PROCEDURE STATUS;
+SHOW PROCEDURE STATUS WHERE db = 'db_storedproc';
 
 --disable_warnings
 DROP PROCEDURE IF EXISTS sp1;
@@ -262,7 +262,7 @@ delimiter ;//
 CALL sp1( "value1, value1" );
 
 --replace_column 5 <modified> 6 <created>
-SHOW PROCEDURE STATUS;
+SHOW PROCEDURE STATUS WHERE db = 'db_storedproc';
 
 --disable_warnings
 DROP PROCEDURE IF EXISTS sp1;
@@ -279,7 +279,7 @@ delimiter ;//
 CALL sp1( "value1" );
 
 --replace_column 5 <modified> 6 <created>
-SHOW PROCEDURE STATUS;
+SHOW PROCEDURE STATUS WHERE db = 'db_storedproc';
 
 --disable_warnings
 DROP PROCEDURE IF EXISTS sp1;

mysql-test/suite/funcs_1/triggers/triggers_0102.inc

@@ -458,7 +458,9 @@ let $message= Testcase 3.5.2.1/2/3:;
 	create trigger trig_db2.trig2 before insert on trig_db2.t1
 		for each row set @test_var3='trig2';
 	select trigger_schema, trigger_name, event_object_table
-		from information_schema.triggers order by trigger_name;
+        from information_schema.triggers
+        where trigger_schema like 'trig_db%'
+        order by trigger_name;
 
 	set @test_var1= '', @test_var2= '', @test_var3= '';
 	insert into t1 (f1,f2) values ('insert to db1 t1 from db1',352);

mysql-test/suite/funcs_1/triggers/triggers_0407.inc

@@ -60,7 +60,9 @@ let $message= Testcase 3.5.4.1:;
 	connection con1_super;
 	drop trigger trg1;
 	select trigger_schema, trigger_name, event_object_table
-		from information_schema.triggers order by trigger_name;
+	from information_schema.triggers
+        where trigger_schema = 'db_drop'
+        order by trigger_name;
 	connection con1_general;
 	Insert into t1 values ('Insert no trigger 3.5.4.1');
 	Select * from t1 order by f1;
@@ -160,7 +162,7 @@ let $message= Testcase 3.5.4.4:;
 	Select * from t1;
 	connection con1_super;
 	Drop database db_drop4;
-	Show databases;
+	Show databases like 'db_drop4';
 	select trigger_schema, trigger_name, event_object_table
 		from information_schema.triggers
 		where information_schema.triggers.trigger_name='trg4';