bk commit into 5.1 tree (msvensson:1.2580) BUG#28772

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-10-26 16:11:20+02:00, msvensson@stripped +2 -0
  Bug#28772 rpl_row_until fails in pushbuild

  mysql-test/suite/rpl/t/rpl_row_until.test@stripped, 2007-10-26 16:11:18+02:00,
msvensson@stripped +4 -0
       - 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@stripped, 2007-10-26 16:11:18+02:00,
msvensson@stripped +4 -0
       - Add a "wait_for_slave_to_stop.inc" after the two "stop slave"
         commands after wich we want to show the slaves status

diff -Nrup a/mysql-test/suite/rpl/t/rpl_row_until.test
b/mysql-test/suite/rpl/t/rpl_row_until.test
--- a/mysql-test/suite/rpl/t/rpl_row_until.test	2007-06-27 14:28:29 +02:00
+++ b/mysql-test/suite/rpl/t/rpl_row_until.test	2007-10-26 16:11:18 +02:00
@@ -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 -Nrup a/mysql-test/suite/rpl/t/rpl_stm_until.test
b/mysql-test/suite/rpl/t/rpl_stm_until.test
--- a/mysql-test/suite/rpl/t/rpl_stm_until.test	2007-06-27 14:28:30 +02:00
+++ b/mysql-test/suite/rpl/t/rpl_stm_until.test	2007-10-26 16:11:18 +02:00
@@ -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;