Below is the list of changes that have just been committed into a local
5.0 repository of mleich. When mleich does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2092 06/04/20 19:43:02 mleich@stripped +1 -0
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
1.10 06/04/20 19:41:02 mleich@stripped +6 -6
Updated result
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: mleich
# Host: three.local.lan
# Root: /home/matthias/Arbeit/mysql-5.0/src-1
--- 1.9/mysql-test/r/rpl_deadlock.result 2006-04-13 21:08:38 +02:00
+++ 1.10/mysql-test/r/rpl_deadlock.result 2006-04-20 19:41:02 +02:00
@@ -50,7 +50,7 @@
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 @@
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_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 @@
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_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 @@
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
| Thread |
|---|
| • bk commit into 5.0 tree (mleich:1.2092) BUG#16920 | mleich | 20 Apr |
