Commit cc3f2163 authored by unknown's avatar unknown
Browse files

rpl_until.test + rpl_until.result Fix (completion) for bug#12429 

Manual merge from 4.1,
extension of the old fix (1.1976 05/12/05 17:57:48 mleich@mysql.com) to two other places.


mysql-test/t/rpl_until.test:
  Auto merged
mysql-test/r/rpl_until.result:
  Manual merge from 4.1,
  extension of the old fix (1.1976 05/12/05 17:57:48 mleich@mysql.com) to two other places.
parents e30b5c78 56830072

mysql-test/r/rpl_until.result

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ n 
4

show slave status;

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_Space	Until_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

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	776	slave-relay-bin.000004	#	master-bin.000001	Yes	No							0		0	319	#	Master	master-bin.000001	319	No						#

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	776	slave-relay-bin.000004	#	master-bin.000001	#	No							0		0	319	#	Master	master-bin.000001	319	No						#

start slave until master_log_file='master-no-such-bin.000001', master_log_pos=291;

select * from t1;

n
@@ -41,7 +41,7 @@ n 
4

show slave status;

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_Space	Until_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

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	776	slave-relay-bin.000004	#	master-bin.000001	Yes	No							0		0	319	#	Master	master-no-such-bin.000001	291	No						#

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	776	slave-relay-bin.000004	#	master-bin.000001	#	No							0		0	319	#	Master	master-no-such-bin.000001	291	No						#

start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=746;

select * from t2;

n

mysql-test/t/rpl_until.test

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ wait_for_slave_to_stop; 
# here table should be still not deleted

select * from t1;

--replace_result $MASTER_MYPORT MASTER_MYPORT

--replace_column 1 # 9 # 23 # 33 #

--replace_column 1 # 9 # 11 # 23 # 33 #

show slave status;



# this should fail right after start
@@ -40,7 +40,7 @@ select * from t1; 
sleep 2;

wait_for_slave_to_stop;

--replace_result $MASTER_MYPORT MASTER_MYPORT

--replace_column 1 # 9 # 23 # 33 #

--replace_column 1 # 9 # 11 # 23 # 33 #

show slave status;



# try replicate all until second insert to t2;