bk commit into 5.1 tree (aelkin:1.2647) BUG#36818

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
5.1 repository of aelkin.  When aelkin 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, 2008-05-20 16:27:46+03:00, aelkin@stripped +1 -0
  Bug #36818  	rpl_server_id1 fails expecting slave has stopped
  
  the test is vulnerable because it does not check if slave has stopped at time
  of the new session is requested `start slave;'
  
  Fixed with deploying explicitly wait_for_slave_to_stop synchronization macro.

  mysql-test/suite/rpl/t/rpl_server_id1.test@stripped, 2008-05-20 16:27:43+03:00,
aelkin@stripped +1 -0
    synchronization with the server on the fact that the slave threads have stopped.

diff -Nrup a/mysql-test/suite/rpl/t/rpl_server_id1.test
b/mysql-test/suite/rpl/t/rpl_server_id1.test
--- a/mysql-test/suite/rpl/t/rpl_server_id1.test	2008-02-20 23:17:59 +02:00
+++ b/mysql-test/suite/rpl/t/rpl_server_id1.test	2008-05-20 16:27:43 +03:00
@@ -10,6 +10,7 @@ reset master;
 
 # replicate ourselves
 stop slave;
+source include/wait_for_slave_to_stop.inc;
 --replace_result $SLAVE_MYPORT SLAVE_PORT
 eval change master to master_port=$SLAVE_MYPORT;
 start slave;