Commit eac9a337 authored by unknown's avatar unknown
Browse files

Reverted old fix with sync_slave_with_master and added a replace commands 

to eliminate nondeterminism in slave start
parent e21f4843

mysql-test/r/rpl_slave_status.result

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ flush privileges; 
stop slave;

start slave;

show slave status;

Slave_IO_State	Connecting to master

Slave_IO_State	#

Master_Host	127.0.0.1

Master_User	rpl

Master_Port	MASTER_MYPORT

mysql-test/t/rpl_slave_status.test

+3 −2
Original line number Diff line number Diff line
@@ -19,12 +19,13 @@ select * from t1; 
connection master;

delete from mysql.user where user='rpl';

flush privileges;

sync_slave_with_master;

connection slave;

stop slave;

start slave;

--replace_result $MASTER_MYPORT MASTER_MYPORT

--replace_column 7 # 8 # 9 # 22 # 23 #

# Column 1 is replaced, since the output can be either

# "Connecting to master" or "Waiting for master update"

--replace_column 1 # 7 # 8 # 9 # 22 # 23 #

--vertical_results

show slave status;