diff options
Diffstat (limited to 'mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result')
-rw-r--r-- | mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result b/mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result index fe2fb1d9da2..6b8d8b9407e 100644 --- a/mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result +++ b/mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result @@ -1,10 +1,6 @@ -stop slave; -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; -reset master; -reset slave; -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; -start slave; -create table t1 (a int) ENGINE=MyISAM; +include/master-slave.inc +[connection master] +create table t1 (a int); insert into t1 values (10); create table t2 (a int) ENGINE=MyISAM; create table t3 (a int) engine=merge union(t1); @@ -21,10 +17,13 @@ flush tables; select * from t3; a stop slave; +include/wait_for_slave_to_stop.inc drop table t1; flush tables with read lock; start slave; +include/wait_for_slave_to_start.inc stop slave; ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction unlock tables; drop table t3, t4, t5; +include/rpl_end.inc |