Commit 45f2e2ae authored by unknown's avatar unknown
Browse files

Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/bug12429

parents 5aeb6929 56830072

mysql-test/r/rpl_until.result

+3 −3
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	561	slave-relay-bin.000002	#	master-bin.000001	Yes	No							0		0	244	#	Master	master-bin.000001	244	No						#

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	561	slave-relay-bin.000002	#	master-bin.000001	#	No							0		0	244	#	Master	master-bin.000001	244	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	561	slave-relay-bin.000002	#	master-bin.000001	Yes	No							0		0	244	#	Master	master-no-such-bin.000001	291	No						#

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	561	slave-relay-bin.000002	#	master-bin.000001	#	No							0		0	244	#	Master	master-no-such-bin.000001	291	No						#

start slave until relay_log_file='slave-relay-bin.000002', relay_log_pos=537;

select * from t2;

n
@@ -49,7 +49,7 @@ n 
2

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	561	slave-relay-bin.000002	#	master-bin.000001	Yes	No							0		0	449	#	Relay	slave-relay-bin.000002	537	No						#

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	561	slave-relay-bin.000002	#	master-bin.000001	#	No							0		0	449	#	Relay	slave-relay-bin.000002	537	No						#

start slave;

stop slave;

start slave until master_log_file='master-bin.000001', master_log_pos=561;

mysql-test/t/rpl_until.test

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ sleep 2; 
# 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
@@ -38,7 +38,7 @@ start slave until master_log_file='master-no-such-bin.000001', master_log_pos=29 
select * from t1;

sleep 2;

--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;
@@ -46,7 +46,7 @@ start slave until relay_log_file='slave-relay-bin.000002', relay_log_pos=537; 
sleep 4;

select * from t2;

--replace_result $MASTER_MYPORT MASTER_MYPORT

--replace_column 1 # 9 # 23 # 33 #

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

show slave status;



# clean up