Commit db623fa8 authored by unknown's avatar unknown
Browse files

Post merge correction for the Changesset 

Fixes for Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs related to MySQL 4.1
and Bug#16920 rpl_deadlock_innodb fails in show slave status (reported for MySQL 5.1)


mysql-test/r/rpl_deadlock.result:
  Updated result
parent 0eb3afaf

mysql-test/r/rpl_deadlock.result

+6 −6
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ Master_User root 
Master_Port	MASTER_MYPORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	13110

Read_Master_Log_Pos	18911

Relay_Log_File	#

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001
@@ -65,7 +65,7 @@ Replicate_Wild_Ignore_Table 
Last_Errno	0

Last_Error	

Skip_Counter	0

Exec_Master_Log_Pos	13110

Exec_Master_Log_Pos	18911

Relay_Log_Space	#

Until_Condition	None

Until_Log_File
@@ -99,7 +99,7 @@ Master_User root 
Master_Port	MASTER_MYPORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	13110

Read_Master_Log_Pos	18911

Relay_Log_File	#

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001
@@ -114,7 +114,7 @@ Replicate_Wild_Ignore_Table 
Last_Errno	0

Last_Error	

Skip_Counter	0

Exec_Master_Log_Pos	13110

Exec_Master_Log_Pos	18911

Relay_Log_Space	#

Until_Condition	None

Until_Log_File
@@ -150,7 +150,7 @@ Master_User root 
Master_Port	MASTER_MYPORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	13110

Read_Master_Log_Pos	18911

Relay_Log_File	#

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001
@@ -165,7 +165,7 @@ Replicate_Wild_Ignore_Table 
Last_Errno	0

Last_Error	

Skip_Counter	0

Exec_Master_Log_Pos	13110

Exec_Master_Log_Pos	18911

Relay_Log_Space	#

Until_Condition	None

Until_Log_File