=== modified file 'mysql-test/suite/multi_source/simple.result'

--- mysql-test/suite/multi_source/simple.result 2012-09-25 16:27:56 +0000

+++ mysql-test/suite/multi_source/simple.result 2012-09-26 11:38:15 +0000

@@ -1,7 +1,12 @@

 change master 'slave1' to master_port=MYPORT_1, master_host='127.0.0.1', master_user='root';

 change master 'slave2' to master_port=MYPORT_2, master_host='127.0.0.1', master_user='root';

 start slave 'slave1';

+set default_master_connection = 'slave1';

+include/wait_for_slave_to_start.inc

+set default_master_connection = 'slave2';

 start slave 'slave2';

+include/wait_for_slave_to_start.inc

+set default_master_connection = '';

 show full slave status;

 Connection_name        Slave_IO_State  Master_Host     Master_User     Master_Port     Connect_Retry  Master_Log_File Read_Master_Log_Pos     Relay_Log_File  Relay_Log_Pos   Relay_Master_Log_File  Slave_IO_Running        Slave_SQL_Running       Replicate_Do_DB Replicate_Ignore_DB   Replicate_Do_Table       Replicate_Ignore_Table  Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table    Last_Errno      Last_Error      Skip_Counter    Exec_Master_Log_Pos     Relay_Log_SpaceUntil_Condition Until_Log_File  Until_Log_Pos   Master_SSL_Allowed      Master_SSL_CA_File    Master_SSL_CA_Path       Master_SSL_Cert Master_SSL_Cipher       Master_SSL_Key  Seconds_Behind_Master  Master_SSL_Verify_Server_Cert   Last_IO_Errno   Last_IO_Error   Last_SQL_Errno  Last_SQL_Error Replicate_Ignore_Server_Ids     Master_Server_Id

 Waiting for master to send event       slave1  127.0.0.1       root    MYPORT_1        60    master-bin.000001        286     mysqld-relay-bin-slave1.000002  572     master-bin.000001     Yes      Yes                                                     0               0       286   875      None            0       No                                              0       No    00                       1

=== modified file 'mysql-test/suite/multi_source/simple.test'

--- mysql-test/suite/multi_source/simple.test   2012-09-25 16:27:56 +0000

+++ mysql-test/suite/multi_source/simple.test   2012-09-26 11:38:06 +0000

@@ -9,8 +9,12 @@

 --replace_result $SERVER_MYPORT_2 MYPORT_2

 eval change master 'slave2' to master_port=$SERVER_MYPORT_2, master_host='127.0.0.1', master_user='root';

 start slave 'slave1';

+set default_master_connection = 'slave1';

+--source include/wait_for_slave_to_start.inc

+set default_master_connection = 'slave2';

 start slave 'slave2';

---sleep 5

+--source include/wait_for_slave_to_start.inc

+set default_master_connection = '';

 --replace_result $SERVER_MYPORT_1 MYPORT_1 $SERVER_MYPORT_2 MYPORT_2

 show full slave status;