bk commit into 5.0 tree (mleich:1.1976) BUG#12429

[mleich]

Below is the list of changes that have just been committed into a local
5.0 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.1976 05/12/05 17:57:48 mleich@stripped +7 -0
  Fix for  Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs
  Solution according to the comments made by Guilhem
  - rpl_relayrotate  Remove the SHOW SLAVE STATUS  It is not needed.
  - rpl_until, rpl_deadlock Omit the printing of the "Slave_IO_Running" value

  mysql-test/t/rpl_until.test
    1.20 05/12/05 17:56:20 matthias@stripped +1 -1
    Omit the printing of the "Slave_IO_Running" value

  mysql-test/t/rpl_relayrotate.test
    1.15 05/12/05 17:56:20 matthias@stripped +0 -3
    Remove the SHWO STATUS SLAVE command

  mysql-test/t/rpl_deadlock.test
    1.10 05/12/05 17:56:20 matthias@stripped +1 -1
    Omit the printing of the "Slave_IO_Running" value

  mysql-test/t/disabled.def
    1.15 05/12/05 17:56:20 matthias@stripped +0 -3
    Enabling of the testcases rpl_relayrotate, rpl_until, rpl_deadlock 

  mysql-test/r/rpl_until.result
    1.22 05/12/05 17:56:20 matthias@stripped +1 -1
    Updated result

  mysql-test/r/rpl_relayrotate.result
    1.18 05/12/05 17:56:20 matthias@stripped +0 -3
    Updated result

  mysql-test/r/rpl_deadlock.result
    1.8 05/12/05 17:56:20 matthias@stripped +1 -1
    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-Z

--- 1.21/mysql-test/r/rpl_until.result	2005-03-25 14:51:03 +01:00
+++ 1.22/mysql-test/r/rpl_until.result	2005-12-05 17:56:20 +01:00
@@ -49,7 +49,7 @@
 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	Yes	No							0		0	608	#	Relay	slave-relay-bin.000004	746	No						#
+#	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						#
 start slave;
 stop slave;
 start slave until master_log_file='master-bin.000001', master_log_pos=776;

--- 1.19/mysql-test/t/rpl_until.test	2005-09-01 17:27:03 +02:00
+++ 1.20/mysql-test/t/rpl_until.test	2005-12-05 17:56:20 +01:00
@@ -49,7 +49,7 @@
 wait_for_slave_to_stop;
 select * from t2;
 --replace_result $MASTER_MYPORT MASTER_MYPORT
---replace_column 1 # 9 # 23 # 33 #
+--replace_column 1 # 9 # 11 # 23 # 33 #
 show slave status;
 
 # clean up

--- 1.7/mysql-test/r/rpl_deadlock.result	2005-07-13 14:15:21 +02:00
+++ 1.8/mysql-test/r/rpl_deadlock.result	2005-12-05 17:56:20 +01:00
@@ -83,5 +83,5 @@
 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	18911	#	#	master-bin.000001	Yes	Yes							0		0	18911	#	None		0	No						#
+#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	18911	#	#	master-bin.000001	#	Yes							0		0	18911	#	None		0	No						#
 drop table t1,t2,t3,t4;

--- 1.17/mysql-test/r/rpl_relayrotate.result	2005-03-25 14:51:03 +01:00
+++ 1.18/mysql-test/r/rpl_relayrotate.result	2005-12-05 17:56:20 +01:00
@@ -16,7 +16,4 @@
 select max(a) from t1;
 max(a)
 8000
-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	735186	#	#	master-bin.000001	Yes	Yes							0		0	735186	#	None		0	No						#
 drop table t1;

--- 1.9/mysql-test/t/rpl_deadlock.test	2005-09-01 17:27:02 +02:00
+++ 1.10/mysql-test/t/rpl_deadlock.test	2005-12-05 17:56:20 +01:00
@@ -102,7 +102,7 @@
 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
 show slave status;
 

--- 1.14/mysql-test/t/rpl_relayrotate.test	2005-07-28 15:12:36 +02:00
+++ 1.15/mysql-test/t/rpl_relayrotate.test	2005-12-05 17:56:20 +01:00
@@ -56,9 +56,6 @@
 # (the only statement with position>=3000 is COMMIT).
 select master_pos_wait('master-bin.001',3000)>=0;
 select max(a) from t1;
---replace_column 1 # 8 # 9 # 23 # 33 #
---replace_result $MASTER_MYPORT MASTER_MYPORT
-show slave status;
 connection master;
 
 # The following DROP is a very important cleaning task:

--- 1.14/mysql-test/t/disabled.def	2005-11-16 15:16:53 +01:00
+++ 1.15/mysql-test/t/disabled.def	2005-12-05 17:56:20 +01:00
@@ -11,7 +11,4 @@
 ##############################################################################
 
 sp-goto         : GOTO is currently is disabled - will be fixed in the future
-rpl_relayrotate : Unstable test case, bug#12429
-rpl_until       : Unstable test case, bug#12429
-rpl_deadlock    : Unstable test case, bug#12429
 kill            : Unstable test case, bug#9712