bk commit into 5.1 tree (mleich:1.2341) BUG#12429

[mleich]

Below is the list of changes that have just been committed into a local
5.1 repository of matthias. When matthias 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.2341 06/04/18 12:56:55 mleich@stripped +2 -0
  Post merge fixes for upmerged fixes for
  Bug#16920: rpl_deadlock_innodb fails in show slave status
  Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs

  mysql-test/t/disabled.def
    1.133 06/04/18 12:56:50 mleich@stripped +1 -2
    - reactivation of testcase rpl_deadlock_innodb
    - removal of rpl_until (does not exist in 5.1)

  mysql-test/r/rpl_deadlock_innodb.result
    1.11 06/04/18 12:56:50 mleich@stripped +9 -9
    Updated result (differences caused by merge)

# 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.1/src-1

--- 1.10/mysql-test/r/rpl_deadlock_innodb.result	2006-04-18 11:30:42 +02:00
+++ 1.11/mysql-test/r/rpl_deadlock_innodb.result	2006-04-18 12:56:50 +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	#
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -59,13 +59,13 @@
 Replicate_Do_DB	
 Replicate_Ignore_DB	
 Replicate_Do_Table	
-Replicate_Ignore_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
+Exec_Master_Log_Pos	#
 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	#
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -108,13 +108,13 @@
 Replicate_Do_DB	
 Replicate_Ignore_DB	
 Replicate_Do_Table	
-Replicate_Ignore_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
+Exec_Master_Log_Pos	#
 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	#
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -159,13 +159,13 @@
 Replicate_Do_DB	
 Replicate_Ignore_DB	
 Replicate_Do_Table	
-Replicate_Ignore_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
+Exec_Master_Log_Pos	#
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	

--- 1.132/mysql-test/t/disabled.def	2006-04-13 18:02:41 +02:00
+++ 1.133/mysql-test/t/disabled.def	2006-04-18 12:56:50 +02:00
@@ -19,7 +19,7 @@
 ndb_cache_multi2         : BUG#18597 2006-04-10 kent  simultaneous drop table and ndb
statistics update triggers node failure
 partition_03ndb          : BUG#16385 2006-03-24 mikael Partitions: crash when updating a
range partitioned NDB table
 ps_7ndb                  : BUG#18950 2006-02-16 jmiller create table like does not obtain
LOCK_open
-rpl_deadlock_innodb      : BUG#16920 2006-04-12 kent    fails in show slave status
(randomly)
+# rpl_deadlock_innodb      : BUG#16920 2006-04-12 kent    fails in show slave status
(randomly)
 rpl_ndb_2innodb          : BUG#19004 2006-03-22 tomas ndb: partition by range and update
hangs
 rpl_ndb_2myisam          : BUG#19004 2006-03-22 tomas ndb: partition by range and update
hangs
 rpl_ndb_auto_inc         : BUG#17086 2006-02-16 jmiller CR: auto_increment_increment and
auto_increment_offset produce duplicate key er
@@ -34,7 +34,6 @@
 rpl_row_func003		 : BUG#19074 2006-13-04 andrei  test failed
 rpl_row_inexist_tbl      : BUG#18948 2006-03-09 mats    Disabled since patch makes this
test wait forever
 rpl_sp                   : BUG#16456 2006-02-16 jmiller
-rpl_until                : BUG#15886 2006-02-16 jmiller Unstable test case
 sp-goto                  : BUG#18949 2006-02-16 jmiller GOTO is currently is disabled -
will be fixed in the future
 mysqldump                : BUG#18078 2006-03-10 lars
 udf                      : BUG#18564 2006-03-27 ian     (Permission by Brian)