summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <petr@mysql.com>2005-10-18 00:48:34 +0400
committerunknown <petr@mysql.com>2005-10-18 00:48:34 +0400
commit9161a9e5c80a16229bfd3f0ac3056ae112e93785 (patch)
tree08c0c95cfc255d09b2295a500b2d1f900b108199 /mysql-test
parent2de36cb3db24b94c7a2581218bb77af8d7d7ccba (diff)
downloadmariadb-git-9161a9e5c80a16229bfd3f0ac3056ae112e93785.tar.gz
fix for im_life_cycle test: replace im instance port number with a constant string.
The lack of this --replace resulted in the test failing on all build hosts mysql-test/r/im_life_cycle.result: fix result mysql-test/t/im_life_cycle.imtest: replace instance port number in result, as it could be set differently for different test runs.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/im_life_cycle.result2
-rw-r--r--mysql-test/t/im_life_cycle.imtest1
2 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/r/im_life_cycle.result b/mysql-test/r/im_life_cycle.result
index 810953e0578..f8eaf0ccb46 100644
--- a/mysql-test/r/im_life_cycle.result
+++ b/mysql-test/r/im_life_cycle.result
@@ -21,7 +21,7 @@ instance_name status version
mysqld2 online VERSION
SHOW VARIABLES LIKE 'port';
Variable_name Value
-port 9312
+port IM_MYSQLD1_PORT
STOP INSTANCE mysqld2;
SHOW INSTANCES;
instance_name status
diff --git a/mysql-test/t/im_life_cycle.imtest b/mysql-test/t/im_life_cycle.imtest
index fff57e16eab..c2b1c9a56ec 100644
--- a/mysql-test/t/im_life_cycle.imtest
+++ b/mysql-test/t/im_life_cycle.imtest
@@ -46,6 +46,7 @@ SHOW INSTANCE STATUS mysqld2;
--connect (mysql_con,localhost,root,,mysql,$IM_MYSQLD1_PORT,$IM_MYSQLD1_SOCK)
--connection mysql_con
+--replace_result $IM_MYSQLD1_PORT IM_MYSQLD1_PORT
SHOW VARIABLES LIKE 'port';
--connection default