Commit a8331c73 authored by unknown's avatar unknown

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:
  Update the result file.
mysql-test/t/rpl_trigger.test:
  Fix the test to query only its own tables to prevent getting tables
  from other tests.
parent e889f9ef
...@@ -862,8 +862,8 @@ START SLAVE; ...@@ -862,8 +862,8 @@ START SLAVE;
SELECT MASTER_POS_WAIT('master-bin.000001', 513) >= 0; SELECT MASTER_POS_WAIT('master-bin.000001', 513) >= 0;
MASTER_POS_WAIT('master-bin.000001', 513) >= 0 MASTER_POS_WAIT('master-bin.000001', 513) >= 0
1 1
SHOW TABLES; SHOW TABLES LIKE 't_';
Tables_in_test Tables_in_test (t_)
t1 t1
t2 t2
SHOW TRIGGERS; SHOW TRIGGERS;
...@@ -891,8 +891,8 @@ DROP TABLE t1; ...@@ -891,8 +891,8 @@ DROP TABLE t1;
DROP TABLE t2; DROP TABLE t2;
STOP SLAVE; STOP SLAVE;
RESET SLAVE; RESET SLAVE;
SHOW TABLES; SHOW TABLES LIKE 't_';
Tables_in_test Tables_in_test (t_)
SHOW TRIGGERS; SHOW TRIGGERS;
Trigger Event Table Statement Timing Created sql_mode Definer Trigger Event Table Statement Timing Created sql_mode Definer
RESET MASTER; RESET MASTER;
...@@ -301,7 +301,7 @@ SELECT MASTER_POS_WAIT('master-bin.000001', 513) >= 0; ...@@ -301,7 +301,7 @@ SELECT MASTER_POS_WAIT('master-bin.000001', 513) >= 0;
# Check that the replication succeeded. # Check that the replication succeeded.
SHOW TABLES; SHOW TABLES LIKE 't_';
SHOW TRIGGERS; SHOW TRIGGERS;
SELECT * FROM t1; SELECT * FROM t1;
SELECT * FROM t2; SELECT * FROM t2;
...@@ -326,7 +326,7 @@ RESET SLAVE; ...@@ -326,7 +326,7 @@ RESET SLAVE;
# The master should be clean. # The master should be clean.
connection master; connection master;
SHOW TABLES; SHOW TABLES LIKE 't_';
SHOW TRIGGERS; SHOW TRIGGERS;
RESET MASTER; RESET MASTER;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment