Merge bk-internal:/home/bk/mysql-5.0

into  shellback.(none):/home/msvensson/mysql/bug17574/my50-bug17574

mysql-test/r/rpl_trigger.result

@@ -862,8 +862,8 @@ START SLAVE;
 SELECT MASTER_POS_WAIT('master-bin.000001', 513) >= 0;
 MASTER_POS_WAIT('master-bin.000001', 513) >= 0
 1
-SHOW TABLES;
-Tables_in_test
+SHOW TABLES LIKE 't_';
+Tables_in_test (t_)
 t1
 t2
 SHOW TRIGGERS;
@@ -891,8 +891,8 @@ DROP TABLE t1;
 DROP TABLE t2;
 STOP SLAVE;
 RESET SLAVE;
-SHOW TABLES;
-Tables_in_test
+SHOW TABLES LIKE 't_';
+Tables_in_test (t_)
 SHOW TRIGGERS;
 Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer
 RESET MASTER;

mysql-test/t/rpl_trigger.test

@@ -301,7 +301,7 @@ SELECT MASTER_POS_WAIT('master-bin.000001', 513) >= 0;
 
 # Check that the replication succeeded.
 
-SHOW TABLES;
+SHOW TABLES LIKE 't_';
 SHOW TRIGGERS;
 SELECT * FROM t1;
 SELECT * FROM t2;
@@ -326,7 +326,7 @@ RESET SLAVE;
 # The master should be clean.
 
 connection master;
-SHOW TABLES;
+SHOW TABLES LIKE 't_';
 SHOW TRIGGERS;
 
 RESET MASTER;