Fix replace_result of $MASTER_MYPORT instead of literal numbers.

mysql-test/t/rpl000015.test:
  Fix replace_result of $MASTER_MYPORT instead of literal numbers.
  The test case rpl000015 needs one exlpicit literal number.
  It changes partial master settings, which seems to reset other settings
  to their defaults. To test this is obviously the intent of this case.

6 files changed, 20 insertions, 20 deletions

diff --git a/mysql-test/t/rpl000015.test b/mysql-test/t/rpl000015.test
index 26d32ea3e11..7c5a8bf3743 100644
--- a/mysql-test/t/rpl000015.test
+++ b/mysql-test/t/rpl000015.test
@@ -11,7 +11,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 3306 MASTER_PORT 3334 MASTER_PORT
+--replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT
 show slave status;
 --replace_result $MASTER_MYPORT MASTER_PORT
 eval change master to master_host='127.0.0.1',master_user='root',
diff --git a/mysql-test/t/rpl_error_ignored_table.test b/mysql-test/t/rpl_error_ignored_table.test
index 4f15f9de0a2..a0b0f1fd599 100644
--- a/mysql-test/t/rpl_error_ignored_table.test
+++ b/mysql-test/t/rpl_error_ignored_table.test
@@ -14,7 +14,7 @@ connection slave;
 sync_with_master;
 # The port number is different when doing the release build with
 # Do-compile, hence we have to replace the port number here accordingly
---replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
+--replace_result $MASTER_MYPORT MASTER_PORT
 show slave status;
 # check that the table has been ignored, because otherwise the test is nonsense
 show tables like 't1';
diff --git a/mysql-test/t/rpl_log.test b/mysql-test/t/rpl_log.test
index e01b3e4e09c..df2b9ecd0cb 100644
--- a/mysql-test/t/rpl_log.test
+++ b/mysql-test/t/rpl_log.test
@@ -79,11 +79,11 @@ connection slave;
 slave start;
 sync_with_master;
 show master logs;
---replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT $VERSION VERSION
+--replace_result $MASTER_MYPORT MASTER_PORT $VERSION VERSION
 show binlog events in 'slave-bin.001' from 4;
---replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT $VERSION VERSION
+--replace_result $MASTER_MYPORT MASTER_PORT $VERSION VERSION
 show binlog events in 'slave-bin.002' from 4;
---replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
+--replace_result $MASTER_MYPORT MASTER_PORT
 show slave status;
 
 # Need to recode the following
diff --git a/mysql-test/t/rpl_log_pos.test b/mysql-test/t/rpl_log_pos.test
index 859180d4e25..1a9a5bc3448 100644
--- a/mysql-test/t/rpl_log_pos.test
+++ b/mysql-test/t/rpl_log_pos.test
@@ -6,7 +6,7 @@ show master status;
 save_master_pos;
 connection slave;
 sync_with_master;
---replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
+--replace_result $MASTER_MYPORT MASTER_PORT
 show slave status;
 slave stop;
 change master to master_log_pos=73;
@@ -15,17 +15,17 @@ sleep 5;
 slave stop;
 
 change master to master_log_pos=73;
---replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
+--replace_result $MASTER_MYPORT MASTER_PORT
 show slave status;
 slave start;
 sleep 5;
---replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
+--replace_result $MASTER_MYPORT MASTER_PORT
 show slave status;
 slave stop;
 change master to master_log_pos=173;
 slave start;
 sleep 2;
---replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
+--replace_result $MASTER_MYPORT MASTER_PORT
 show slave status;
 connection master;
 show master status;
diff --git a/mysql-test/t/rpl_max_relay_size.test b/mysql-test/t/rpl_max_relay_size.test
index 7e9a8a1872e..d2278b6d6df 100644
--- a/mysql-test/t/rpl_max_relay_size.test
+++ b/mysql-test/t/rpl_max_relay_size.test
@@ -28,7 +28,7 @@ set global max_relay_log_size=8192-1; # mapped to 4096
 select @@global.max_relay_log_size;
 start slave;
 sync_with_master;
---replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT 3334 MASTER_PORT
+--replace_result $MASTER_MYPORT MASTER_PORT
 show slave status;
 stop slave;
 reset slave;
@@ -36,7 +36,7 @@ set global max_relay_log_size=(5*4096);
 select @@global.max_relay_log_size;
 start slave;
 sync_with_master;
---replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT 3334 MASTER_PORT
+--replace_result $MASTER_MYPORT MASTER_PORT
 --replace_column 18 #
 show slave status;
 stop slave;
@@ -45,7 +45,7 @@ set global max_relay_log_size=0;
 select @@global.max_relay_log_size;
 start slave;
 sync_with_master;
---replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT 3334 MASTER_PORT
+--replace_result $MASTER_MYPORT MASTER_PORT
 show slave status;
 
 # Tests below are mainly to ensure that we have not coded with wrong assumptions
@@ -55,7 +55,7 @@ reset slave;
 # test of relay log rotation when the slave is stopped
 # (to make sure it does not crash).
 flush logs;
---replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT 3334 MASTER_PORT
+--replace_result $MASTER_MYPORT MASTER_PORT
 show slave status;
 
 reset slave;
@@ -70,7 +70,7 @@ create table t1 (a int);
 save_master_pos;
 connection slave;
 sync_with_master;
---replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT 3334 MASTER_PORT
+--replace_result $MASTER_MYPORT MASTER_PORT
 show slave status;
 # one more rotation, to be sure Relay_log_space is correctly updated
 flush logs;
@@ -79,7 +79,7 @@ drop table t1;
 save_master_pos;
 connection slave;
 sync_with_master;
---replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT 3334 MASTER_PORT
+--replace_result $MASTER_MYPORT MASTER_PORT
 show slave status;
 
 connection master;
diff --git a/mysql-test/t/rpl_rotate_logs.test b/mysql-test/t/rpl_rotate_logs.test
index 70366fc1749..76a06d01fa9 100644
--- a/mysql-test/t/rpl_rotate_logs.test
+++ b/mysql-test/t/rpl_rotate_logs.test
@@ -25,13 +25,13 @@ system chmod 600 var/slave-data/master.info;
 # init_strvar_from_file() in init_master_info()).
 --error 1201
 slave start;
---replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
+--replace_result $MASTER_MYPORT MASTER_PORT
 # CHANGE MASTER will fail because it first parses master.info before changing it
 # (so when master.info is bad, people have to use RESET SLAVE first).
 --error 1201
 eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, master_user='root';
 reset slave;
---replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
+--replace_result $MASTER_MYPORT MASTER_PORT
 eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, master_user='root'; 
 connection master;
 reset master;
@@ -49,7 +49,7 @@ insert into t1 values('Could not break slave'),('Tried hard');
 save_master_pos;
 connection slave;
 sync_with_master;
---replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
+--replace_result $MASTER_MYPORT MASTER_PORT
 --replace_column 18 #
 show slave status;
 select * from t1;
@@ -101,7 +101,7 @@ insert into t2 values (65);
 save_master_pos;
 connection slave;
 sync_with_master;
---replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
+--replace_result $MASTER_MYPORT MASTER_PORT
 --replace_column 18 #
 show slave status;
 select * from t2;
@@ -133,7 +133,7 @@ connection slave;
 sync_with_master;
 select * from t4;
 
---replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT
+--replace_result $MASTER_MYPORT MASTER_PORT
 --replace_column 18 #
 show slave status;
 # because of concurrent insert, the table may not be up to date