Commit 780fc6b6 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
parents 5a0b54fd deecc9bb

mysql-test/mysql-test-run.pl

+1 −0
Original line number Diff line number Diff line
@@ -1676,6 +1676,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};

mysql-test/r/rpl000015.result

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File 
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;

mysql-test/t/rpl000015.test

+1 −1
Original line number Diff line number Diff line
@@ -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