use $MASTER_PORT

4 files changed, 9 insertions, 15 deletions

diff --git a/mysql-test/r/rpl000014.result b/mysql-test/r/rpl000014.result
index ec79c4c37e6..e5130792d78 100644
--- a/mysql-test/r/rpl000014.result
+++ b/mysql-test/r/rpl000014.result
@@ -8,21 +8,21 @@ File	Position	Binlog_do_db	Binlog_ignore_db
 master-bin.001	79		
 show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	9999	1	master-bin.001	79	Yes			0		0	1
+127.0.0.1	root	$MASTER_MYPORT	1	master-bin.001	79	Yes			0		0	1
 change master to master_log_pos=73;
 slave stop;
 change master to master_log_pos=73;
 show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	9999	1	master-bin.001	73	No			0		0	1
+127.0.0.1	root	$MASTER_MYPORT	1	master-bin.001	73	No			0		0	1
 slave start;
 show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	9999	1	master-bin.001	73	Yes			0		0	1
+127.0.0.1	root	$MASTER_MYPORT	1	master-bin.001	73	Yes			0		0	1
 change master to master_log_pos=173;
 show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	9999	1	master-bin.001	173	Yes			0		0	1
+127.0.0.1	root	$MASTER_MYPORT	1	master-bin.001	173	Yes			0		0	1
 show master status;
 File	Position	Binlog_do_db	Binlog_ignore_db
 master-bin.001	79		
diff --git a/mysql-test/r/rpl000015.result b/mysql-test/r/rpl000015.result
index 6418ac590fe..e3bde4a5abd 100644
--- a/mysql-test/r/rpl000015.result
+++ b/mysql-test/r/rpl000015.result
@@ -9,16 +9,16 @@ Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Rep
 change master to master_host='127.0.0.1';
 show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	test	9998	60		4	No			0		0	0
+127.0.0.1	test	3306	60		4	No			0		0	0
 change master to master_host='127.0.0.1',master_user='root',
-master_password='',master_port=$MASTER_MYPORT;
+master_password='',master_port=9306;
 show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	9999	60		4	No			0		0	0
+127.0.0.1	root	9306	60		4	No			0		0	0
 slave start;
 show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	9999	60	master-bin.001	79	Yes			0		0	1
+127.0.0.1	root	9306	60	master-bin.001	79	Yes			0		0	1
 drop table if exists t1;
 create table t1 (n int);
 insert into t1 values (10),(45),(90);
diff --git a/mysql-test/t/rpl000014.test b/mysql-test/t/rpl000014.test
index 604e614b3a8..b58b868ff74 100644
--- a/mysql-test/t/rpl000014.test
+++ b/mysql-test/t/rpl000014.test
@@ -1,21 +1,18 @@
+eval_result;
 source include/master-slave.inc;
 connection master;
 show master status;
 save_master_pos;
 connection slave;
 sync_with_master;
---replace_result 9306 9999 3334 9999 3335 9999
 show slave status;
 change master to master_log_pos=73;
 slave stop;
 change master to master_log_pos=73;
---replace_result 9306 9999 3334 9999 3335 9999
 show slave status;
 slave start;
---replace_result 9306 9999 3334 9999 3335 9999
 show slave status;
 change master to master_log_pos=173;
---replace_result 9306 9999 3334 9999 3335 9999
 show slave status;
 connection master;
 show master status;
diff --git a/mysql-test/t/rpl000015.test b/mysql-test/t/rpl000015.test
index 3b29049f1d7..9dbbcf64802 100644
--- a/mysql-test/t/rpl000015.test
+++ b/mysql-test/t/rpl000015.test
@@ -9,15 +9,12 @@ connection slave;
 reset slave;
 show slave status;
 change master to master_host='127.0.0.1';
---replace_result 3306 9998 9306 9999 3334 9999 3335 9999
 show slave status;
 eval change master to master_host='127.0.0.1',master_user='root',
  master_password='',master_port=$MASTER_MYPORT;
---replace_result 9306 9999 3334 9999 3335 9999
 show slave status;
 slave start;
 sync_with_master;
---replace_result 9306 9999 3334 9999 3335 9999
 show slave status;
 connection master;
 drop table if exists t1;