bzr commit into mysql-5.1 branch (aelkin:2618) Bug#36818

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/FIXES/5.1-rpl-bug36818-rpl_server_id1/

 2618 Andrei Elkin	2008-07-01
      Bug #36818 rpl_server_id1 fails expecting slave has stopped
      
      A "working" commit to call back the failure in order to inspect remaining logs.
modified:
  mysql-test/suite/rpl/t/rpl_server_id1.test

per-file messages:
  mysql-test/suite/rpl/t/rpl_server_id1.test
    Adding unnecessary but harmful synchronization in order to call back the failure on pb.
=== modified file 'mysql-test/suite/rpl/t/rpl_server_id1.test'
--- a/mysql-test/suite/rpl/t/rpl_server_id1.test	2008-02-20 21:18:01 +0000
+++ b/mysql-test/suite/rpl/t/rpl_server_id1.test	2008-07-01 16:36:40 +0000
@@ -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;