bzr push into mysql-6.0 branch (aelkin:2671) Bug#36818

[Andrei Elkin]

 2671 Andrei Elkin	2008-07-02
      Bug #36818 rpl_server_id1 fails expecting slave has stopped
      
      a "null" push in order to summon the failure.
      Need more info from pb's slave logs in order to fix the bug.
modified:
  mysql-test/suite/rpl/t/rpl_server_id1.test

=== modified file 'mysql-test/suite/rpl/t/rpl_server_id1.test'
--- a/mysql-test/suite/rpl/t/rpl_server_id1.test	2008-05-20 15:14:03 +0000
+++ b/mysql-test/suite/rpl/t/rpl_server_id1.test	2008-07-02 09:17:14 +0000
@@ -10,7 +10,7 @@ reset master;
 
 # replicate ourselves
 stop slave;
-source include/wait_for_slave_to_stop.inc;
+# source include/wait_for_slave_to_stop.inc;
 --replace_result $SLAVE_MYPORT SLAVE_PORT
 eval change master to master_port=$SLAVE_MYPORT;
 start slave;