Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge

mysql-test/suite/rpl/r/rpl_init_slave.result

@@ -4,6 +4,8 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
+stop slave;
+start slave;
 show variables like 'init_slave';
 Variable_name	Value
 init_slave	set global max_connections=500

mysql-test/suite/rpl/t/rpl_init_slave.test

@@ -4,6 +4,13 @@ source include/master-slave.inc;
 # Test of init_slave variable
 #
 
+connection slave;
+stop slave;
+source include/wait_for_slave_to_stop.inc;
+start slave;
+source include/wait_for_slave_to_start.inc;
+
+connection master;
 save_master_pos;
 connection slave;
 show variables like 'init_slave';