bk commit into 5.1 tree (mkindahl:1.2671)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mkindahl. When mkindahl 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-01-11 18:09:17+01:00, mkindahl@stripped +2 -0
  Fixing failing test case.

  mysql-test/suite/rpl/r/rpl_init_slave.result@stripped, 2008-01-11 18:09:03+01:00, mkindahl@stripped +2 -0
    Result change.

  mysql-test/suite/rpl/t/rpl_init_slave.test@stripped, 2008-01-11 18:09:09+01:00, mkindahl@stripped +7 -0
    Starting and stopping slave to make sure that the init_slave
    variable is executed.

diff -Nrup a/mysql-test/suite/rpl/r/rpl_init_slave.result b/mysql-test/suite/rpl/r/rpl_init_slave.result
--- a/mysql-test/suite/rpl/r/rpl_init_slave.result	2007-06-27 14:27:29 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_init_slave.result	2008-01-11 18:09:03 +01:00
@@ -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
diff -Nrup a/mysql-test/suite/rpl/t/rpl_init_slave.test b/mysql-test/suite/rpl/t/rpl_init_slave.test
--- a/mysql-test/suite/rpl/t/rpl_init_slave.test	2007-12-06 16:26:58 +01:00
+++ b/mysql-test/suite/rpl/t/rpl_init_slave.test	2008-01-11 18:09:09 +01:00
@@ -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';