Commit eb9c676f authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/matthias/Arbeit/mysql-4.1/src 

into  mysql.com:/home/matthias/Arbeit/mysql-4.1/src-1
parents 49bd7632 f1a50035

mysql-test/r/rpl_deadlock.result

+99 −6
Original line number Diff line number Diff line
@@ -44,8 +44,39 @@ select * from t2; 
a

22

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	13110	#	#	master-bin.000001	Yes	Yes							0		0	13110	#	None		0	No						#

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	13110

Relay_Log_File	#

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001

Slave_IO_Running	Yes

Slave_SQL_Running	Yes

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	13110

Relay_Log_Space	#

Until_Condition	None

Until_Log_File	

Until_Log_Pos	0

Master_SSL_Allowed	No

Master_SSL_CA_File	

Master_SSL_CA_Path	

Master_SSL_Cert	

Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

stop slave;

change master to master_log_pos=401;

begin;
@@ -62,8 +93,39 @@ select * from t2; 
a

22

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	13110	#	#	master-bin.000001	Yes	Yes							0		0	13110	#	None		0	No						#

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	13110

Relay_Log_File	#

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001

Slave_IO_Running	#

Slave_SQL_Running	Yes

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	13110

Relay_Log_Space	#

Until_Condition	None

Until_Log_File	

Until_Log_Pos	0

Master_SSL_Allowed	No

Master_SSL_CA_File	

Master_SSL_CA_Path	

Master_SSL_Cert	

Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

set global max_relay_log_size=0;

stop slave;

change master to master_log_pos=401;
@@ -82,6 +144,37 @@ select * from t2; 
a

22

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	13110	#	#	master-bin.000001	Yes	Yes							0		0	13110	#	None		0	No						#

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	13110

Relay_Log_File	#

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001

Slave_IO_Running	#

Slave_SQL_Running	Yes

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	13110

Relay_Log_Space	#

Until_Condition	None

Until_Log_File	

Until_Log_Pos	0

Master_SSL_Allowed	No

Master_SSL_CA_File	

Master_SSL_CA_Path	

Master_SSL_Cert	

Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

drop table t1,t2,t3,t4;

mysql-test/r/rpl_relayrotate.result

+2 −5
Original line number Diff line number Diff line
@@ -10,10 +10,7 @@ reset slave; 
start slave;

stop slave;

start slave;

select master_pos_wait('master-bin.001',3000)>=0;

master_pos_wait('master-bin.001',3000)>=0

1

select * from t1 where a=8000;

a

select max(a) from t1;

max(a)

8000

drop table t1;

mysql-test/t/disabled.def

+0 −3
Original line number Diff line number Diff line
@@ -10,6 +10,3 @@ 
#

##############################################################################

rpl_relayrotate : Unstable test case, bug#12429

rpl_until       : Unstable test case, bug#12429

rpl_deadlock    : Unstable test case, bug#12429

mysql-test/t/rpl_deadlock.test

+11 −5
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ while ($1) 
enable_query_log;

select * from t1 for update;

start slave;

--sleep 3 # hope that slave is blocked now

--real_sleep 3 # hope that slave is blocked now

insert into t2 values(22); # provoke deadlock, slave should be victim

commit;

sync_with_master;
@@ -67,7 +67,9 @@ select * from t2; 
# check that no error is reported

--replace_column 1 # 8 # 9 # 23 # 33 #

--replace_result $MASTER_MYPORT MASTER_MYPORT

--vertical_results

show slave status;

--horizontal_results



# 2) Test lock wait timeout
@@ -76,15 +78,17 @@ change master to master_log_pos=401; # the BEGIN log event 
begin;

select * from t2 for update; # hold lock

start slave;

--sleep 10 # slave should have blocked, and be retrying

--real_sleep 10 # slave should have blocked, and be retrying

commit;

sync_with_master;

select * from t1; # check that slave succeeded finally

select * from t2;

# check that no error is reported

--replace_column 1 # 8 # 9 # 23 # 33 #

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

--replace_result $MASTER_MYPORT MASTER_MYPORT

--vertical_results

show slave status;

--horizontal_results



# Now we repeat 2), but with BEGIN in the same relay log as

# COMMIT (to see if seeking into hot log is ok).
@@ -97,14 +101,16 @@ change master to master_log_pos=401; 
begin;

select * from t2 for update;

start slave;

--sleep 10

--real_sleep 10

commit;

sync_with_master;

select * from t1;

select * from t2;

--replace_column 1 # 8 # 9 # 23 # 33 #

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

--replace_result $MASTER_MYPORT MASTER_MYPORT

--vertical_results

show slave status;

--horizontal_results



connection master;

drop table t1,t2,t3,t4;

mysql-test/t/rpl_relayrotate.test

+3 −5
Original line number Diff line number Diff line
@@ -52,11 +52,9 @@ start slave; 
# which proves that the transaction restarted at

# the right place.

# We must wait for the transaction to commit before

# reading, MASTER_POS_WAIT() will do it for sure

# (the only statement with position>=3000 is COMMIT).

select master_pos_wait('master-bin.001',3000)>=0;

select * from t1 where a=8000;



# reading:

sync_with_master;

select max(a) from t1;

connection master;



# The following DROP is a very important cleaning task: