bk commit into 4.1 tree (mleich:1.2697) BUG#31030

[mleich]

Below is the list of changes that have just been committed into a local
4.1 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@stripped, 2007-11-30 18:06:28+01:00, mleich@stripped +3 -0
  Fix for
     Bug#31030 rpl000015.test fails if $MYSQL_TCP_PORT != 3306
  Note:
    This bug does not occur in MySQL 5.0 and up, because
    ChangeSet 1.2328.2.1 2006/11/27 for MySQL 5.0 prevents this.
    The 5.0 fix uses the environment variable DEFAULT_MASTER_PORT
    which is set by mysql-test-run.pl.
    mysql-test-run.pl in 4.1 does not set this variable.
    There are two alternatives:
    1) Backport the 5.0 fix for this test including modifications
       to mysql-test-run.pl and mysql-test-run-shell.
       This is a not acceptable impact on an old MySQL version.
    2) Fix the problem different than in 5.0 like in the current
       ChangeSet + do not apply these changes when upmerging to 5.0

  mysql-test/r/rpl000015.result@stripped, 2007-11-30 18:06:27+01:00, mleich@stripped +1 -1
    Updated result

  mysql-test/t/disabled.def@stripped, 2007-11-30 18:06:27+01:00, mleich@stripped +0 -1
    Enable rpl000015

  mysql-test/t/rpl000015.test@stripped, 2007-11-30 18:06:27+01:00, mleich@stripped +1 -1
    Unify the MASTER_PORT number

diff -Nrup a/mysql-test/r/rpl000015.result b/mysql-test/r/rpl000015.result
--- a/mysql-test/r/rpl000015.result	2006-10-19 10:54:21 +02:00
+++ b/mysql-test/r/rpl000015.result	2007-11-30 18:06:27 +01:00
@@ -8,7 +8,7 @@ Slave_IO_State	Master_Host	Master_User	M
 change master to master_host='127.0.0.1';
 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	test	MASTER_PORT	7		4	#	#		No	No							0		0	0	#	None		0	No						#
+#	127.0.0.1	test	#	7		4	#	#		No	No							0		0	0	#	None		0	No						#
 change master to master_host='127.0.0.1',master_user='root',
 master_password='',master_port=MASTER_PORT;
 show slave status;
diff -Nrup a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
--- a/mysql-test/t/disabled.def	2007-11-02 10:11:26 +01:00
+++ b/mysql-test/t/disabled.def	2007-11-30 18:06:27 +01:00
@@ -10,4 +10,3 @@
 #
 ##############################################################################
 
-rpl000015       :  Bug#31030 - rpl000015.test fails if $MYSQL_TCP_PORT != 3306
diff -Nrup a/mysql-test/t/rpl000015.test b/mysql-test/t/rpl000015.test
--- a/mysql-test/t/rpl000015.test	2006-12-19 15:10:14 +01:00
+++ b/mysql-test/t/rpl000015.test	2007-11-30 18:06:27 +01:00
@@ -13,7 +13,7 @@ show slave status;
 change master to master_host='127.0.0.1';
 # The following needs to be cleaned up when change master is fixed
 --replace_result $MASTER_MYPORT MASTER_PORT $MYSQL_TCP_PORT MASTER_PORT
---replace_column 1 # 8 # 9 # 23 # 33 #
+--replace_column 1 # 4 # 8 # 9 # 23 # 33 #
 show slave status;
 --replace_result $MASTER_MYPORT MASTER_PORT
 eval change master to master_host='127.0.0.1',master_user='root',