summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Elkin <aelkin@mysql.com>2010-02-28 19:39:28 +0200
committerAndrei Elkin <aelkin@mysql.com>2010-02-28 19:39:28 +0200
commit055c61049e32572464495ef23d0cdf158e083dda (patch)
tree528d1675d7cae6c08d78a79c220f2e7aa4c22708
parent1faafbb0475c538b1348789a86cd6455ee24d37d (diff)
downloadmariadb-git-055c61049e32572464495ef23d0cdf158e083dda.tar.gz
bug#50296
a small refinement to the test
-rw-r--r--mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result2
-rw-r--r--mysql-test/suite/large_tests/t/rpl_slave_net_timeout.test2
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result b/mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result
index 526221fcb50..81de6e228e0 100644
--- a/mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result
+++ b/mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result
@@ -11,7 +11,7 @@ set @@global.general_log = ON;
set @@global.log_output = 'table,file';
include/stop_slave.inc
set @@global.slave_net_timeout = @@global.net_read_timeout * 2;
-change master to master_host = '127.0.0.1',master_port = 13020,
+change master to master_host = '127.0.0.1',master_port = MASTER_PORT,
master_user = 'root', master_heartbeat_period = 0;
include/start_slave.inc
include/stop_slave.inc
diff --git a/mysql-test/suite/large_tests/t/rpl_slave_net_timeout.test b/mysql-test/suite/large_tests/t/rpl_slave_net_timeout.test
index 7712c054258..9a2cdc3b596 100644
--- a/mysql-test/suite/large_tests/t/rpl_slave_net_timeout.test
+++ b/mysql-test/suite/large_tests/t/rpl_slave_net_timeout.test
@@ -38,7 +38,7 @@ let $idle_time=`select @@global.slave_net_timeout * 2`;
# slave.net_read_timeout < slave_net_timeout
# won't cause reconnecting by the slave within at least
# slave_net_timeout interval.
-
+--replace_result $MASTER_MYPORT MASTER_PORT
eval change master to master_host = '127.0.0.1',master_port = $MASTER_MYPORT,
master_user = 'root', master_heartbeat_period = 0;