Commit 3900549f authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/bkroot/mysql-5.0-rpl 

into  mysql.com:/home/bk/b15886-mysql-5.0


mysql-test/t/rpl_until.test:
  Auto merged
parents 8297ddbc 113b3f95

mysql-test/r/rpl_until.result

+136 −12
Original line number Diff line number Diff line
@@ -29,9 +29,40 @@ n 
2

3

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	#	No							0		0	319	#	Master	master-bin.000001	319	No						#

SHOW SLAVE STATUS;

Slave_IO_State	#

Master_Host	127.0.0.1

Master_User	root

Master_Port	MASTER_MYPORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	776

Relay_Log_File	slave-relay-bin.000004

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001

Slave_IO_Running	#

Slave_SQL_Running	No

Replicate_Do_DB	

Replicate_Ignore_DB	

Replicate_Do_Table	

Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	0

Last_Error	

Skip_Counter	0

Exec_Master_Log_Pos	319

Relay_Log_Space	#

Until_Condition	Master

Until_Log_File	master-bin.000001

Until_Log_Pos	319

Master_SSL_Allowed	No

Master_SSL_CA_File	

Master_SSL_CA_Path	

Master_SSL_Cert	

Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

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

select * from t1;

n
@@ -39,23 +70,116 @@ n 
2

3

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	#	No							0		0	319	#	Master	master-no-such-bin.000001	291	No						#

SHOW SLAVE STATUS;

Slave_IO_State	#

Master_Host	127.0.0.1

Master_User	root

Master_Port	MASTER_MYPORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	776

Relay_Log_File	slave-relay-bin.000004

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001

Slave_IO_Running	#

Slave_SQL_Running	No

Replicate_Do_DB	

Replicate_Ignore_DB	

Replicate_Do_Table	

Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	0

Last_Error	

Skip_Counter	0

Exec_Master_Log_Pos	319

Relay_Log_Space	#

Until_Condition	Master

Until_Log_File	master-no-such-bin.000001

Until_Log_Pos	291

Master_SSL_Allowed	No

Master_SSL_CA_File	

Master_SSL_CA_Path	

Master_SSL_Cert	

Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

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

select * from t2;

n

1

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	776	slave-relay-bin.000004	#	master-bin.000001	#	No							0		0	608	#	Relay	slave-relay-bin.000004	746	No						#

SHOW SLAVE STATUS;

Slave_IO_State	#

Master_Host	127.0.0.1

Master_User	root

Master_Port	MASTER_MYPORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	776

Relay_Log_File	slave-relay-bin.000004

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001

Slave_IO_Running	#

Slave_SQL_Running	No

Replicate_Do_DB	

Replicate_Ignore_DB	

Replicate_Do_Table	

Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	0

Last_Error	

Skip_Counter	0

Exec_Master_Log_Pos	608

Relay_Log_Space	#

Until_Condition	Relay

Until_Log_File	slave-relay-bin.000004

Until_Log_Pos	746

Master_SSL_Allowed	No

Master_SSL_CA_File	

Master_SSL_CA_Path	

Master_SSL_Cert	

Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

start slave;

stop slave;

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

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	776	#	Master	master-bin.000001	776	No						#

SHOW SLAVE STATUS;

Slave_IO_State	#

Master_Host	127.0.0.1

Master_User	root

Master_Port	MASTER_MYPORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	776

Relay_Log_File	slave-relay-bin.000004

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001

Slave_IO_Running	Yes

Slave_SQL_Running	No

Replicate_Do_DB	

Replicate_Ignore_DB	

Replicate_Do_Table	

Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	0

Last_Error	

Skip_Counter	0

Exec_Master_Log_Pos	776

Relay_Log_Space	#

Until_Condition	Master

Until_Log_File	master-bin.000001

Until_Log_Pos	776

Master_SSL_Allowed	No

Master_SSL_CA_File	

Master_SSL_CA_Path	

Master_SSL_Cert	

Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

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

ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL

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

mysql-test/t/rpl_until.test

+4 −4
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ wait_for_slave_to_stop; 
select * from t1;

--replace_result $MASTER_MYPORT MASTER_MYPORT

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

show slave status;

--query_vertical SHOW SLAVE STATUS



# this should fail right after start

start slave until master_log_file='master-no-such-bin.000001', master_log_pos=291;
@@ -41,7 +41,7 @@ sleep 2; 
wait_for_slave_to_stop;

--replace_result $MASTER_MYPORT MASTER_MYPORT

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

show slave status;

--query_vertical SHOW SLAVE STATUS



# try replicate all until second insert to t2;

start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=746;
@@ -50,7 +50,7 @@ wait_for_slave_to_stop; 
select * from t2;

--replace_result $MASTER_MYPORT MASTER_MYPORT

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

show slave status;

--query_vertical SHOW SLAVE STATUS



# clean up

start slave;
@@ -67,7 +67,7 @@ wait_for_slave_to_stop; 
# here the sql slave thread should be stopped

--replace_result $MASTER_MYPORT MASTER_MYPORT bin.000005 bin.000004 bin.000006 bin.000004 bin.000007 bin.000004

--replace_column 1 # 9 # 23 # 33 #

show slave status;

--query_vertical SHOW SLAVE STATUS



#testing various error conditions

--error 1277