From 615357b96c91e54b2fc9031e16a9182c43b46cf9 Mon Sep 17 00:00:00 2001 From: "anozdrin@mysql.com" <> Date: Wed, 8 Mar 2006 00:13:27 +0300 Subject: [PATCH] After-merge fix: fix the test case for BUG#16266 to query only its own tables to prevent getting tables from others. --- mysql-test/r/rpl_trigger.result | 8 ++++---- mysql-test/t/rpl_trigger.test | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mysql-test/r/rpl_trigger.result b/mysql-test/r/rpl_trigger.result index b9b20b82acd..3e4a3349e13 100644 --- a/mysql-test/r/rpl_trigger.result +++ b/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; diff --git a/mysql-test/t/rpl_trigger.test b/mysql-test/t/rpl_trigger.test index 90822e0654c..35f0a0b0a4b 100644 --- a/mysql-test/t/rpl_trigger.test +++ b/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;