bk commit into 5.0 tree (msvensson:1.2339)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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, 2006-11-27 19:56:04+01:00, msvensson@neptunus.(none) +3 -0
  Fix for rpl000015 that fails if $MYSQL_TCP_PORT is set. The default value for
  master_port after a "change master" will be set to the compiled in default value
  i.e not always the same as what the master report as it's port number. 

  mysql-test/mysql-test-run.pl@stripped, 2006-11-27 19:56:02+01:00, msvensson@neptunus.(none)
+1 -0
    Read the master-port value from the mysqld. Used for replacing the 
    default compiled in port number in for example rpl000015

  mysql-test/r/rpl000015.result@stripped, 2006-11-27 19:56:02+01:00, msvensson@neptunus.(none)
+1 -1
    Update result file

  mysql-test/t/rpl000015.test@stripped, 2006-11-27 19:56:02+01:00, msvensson@neptunus.(none)
+1 -1
    When changing master without specifying master port, the port for master will
    be set to the compiled in default. Replace with that value

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0-maint

--- 1.165/mysql-test/mysql-test-run.pl	2006-11-27 19:56:09 +01:00
+++ 1.166/mysql-test/mysql-test-run.pl	2006-11-27 19:56:09 +01:00
@@ -1668,6 +1668,7 @@ sub environment_setup () {
   $ENV{'SLAVE_MYPORT1'}=      $slave->[1]->{'port'};
   $ENV{'SLAVE_MYPORT2'}=      $slave->[2]->{'port'};
   $ENV{'MYSQL_TCP_PORT'}=     $mysqld_variables{'port'};
+  $ENV{'DEFAULT_MASTER_PORT'}= $mysqld_variables{'master-port'};
 
   $ENV{'IM_PATH_SOCK'}=       $instance_manager->{path_sock};
   $ENV{'IM_USERNAME'}=        $instance_manager->{admin_login};

--- 1.35/mysql-test/r/rpl000015.result	2006-11-27 19:56:09 +01:00
+++ 1.36/mysql-test/r/rpl000015.result	2006-11-27 19:56:09 +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	DEFAULT_MASTER_PORT	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;

--- 1.33/mysql-test/t/rpl000015.test	2006-11-27 19:56:09 +01:00
+++ 1.34/mysql-test/t/rpl000015.test	2006-11-27 19:56:09 +01:00
@@ -12,7 +12,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 $MYSQL_TCP_PORT MASTER_PORT
+--replace_result $DEFAULT_MASTER_PORT DEFAULT_MASTER_PORT
 --replace_column 1 # 8 # 9 # 23 # 33 #
 show slave status;
 --replace_result $MASTER_MYPORT MASTER_PORT