From 1b56c5d7306e7d7666c1e00d1f0fd4e9230c1b48 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 26 Oct 2007 16:11:20 +0200 Subject: [PATCH] Bug#28772 rpl_row_until fails in pushbuild mysql-test/suite/rpl/t/rpl_row_until.test: - Add a "wait_for_slave_to_stop.inc" after the two "stop slave" commands after wich we want to show the slaves status mysql-test/suite/rpl/t/rpl_stm_until.test: - Add a "wait_for_slave_to_stop.inc" after the two "stop slave" commands after wich we want to show the slaves status --- mysql-test/suite/rpl/t/rpl_row_until.test | 4 ++++ mysql-test/suite/rpl/t/rpl_stm_until.test | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/mysql-test/suite/rpl/t/rpl_row_until.test b/mysql-test/suite/rpl/t/rpl_row_until.test index 9464e5cfadd..610eec305df 100644 --- a/mysql-test/suite/rpl/t/rpl_row_until.test +++ b/mysql-test/suite/rpl/t/rpl_row_until.test @@ -13,6 +13,8 @@ save_master_pos; connection slave; sync_with_master; stop slave; +# Make sure the slave sql and io thread has stopped +--source include/wait_for_slave_to_stop.inc connection master; # create some events on master @@ -52,6 +54,8 @@ save_master_pos; connection slave; sync_with_master; stop slave; +# Make sure the slave sql and io thread has stopped +--source include/wait_for_slave_to_stop.inc # this should stop immediately as we are already there start slave until master_log_file='master-bin.000001', master_log_pos=740; diff --git a/mysql-test/suite/rpl/t/rpl_stm_until.test b/mysql-test/suite/rpl/t/rpl_stm_until.test index 98e7e0e5eac..c8d3cb1823d 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_until.test +++ b/mysql-test/suite/rpl/t/rpl_stm_until.test @@ -12,6 +12,8 @@ save_master_pos; connection slave; sync_with_master; stop slave; +# Make sure the slave sql and io thread has stopped +--source include/wait_for_slave_to_stop.inc connection master; # create some events on master @@ -51,6 +53,8 @@ save_master_pos; connection slave; sync_with_master; stop slave; +# Make sure the slave sql and io thread has stopped +--source include/wait_for_slave_to_stop.inc # this should stop immediately as we are already there start slave until master_log_file='master-bin.000001', master_log_pos=776;