bk commit into 5.0 tree (petr:1.2070)

[Petr Chardin]

Below is the list of changes that have just been committed into a local
5.0 repository of cps. When cps does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2070 05/10/18 00:48:34 petr@stripped +2 -0
  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/t/im_life_cycle.imtest
    1.2 05/10/18 00:48:22 petr@stripped +1 -0
    replace instance port number in result, as it could be set differently for different
    test runs.

  mysql-test/r/im_life_cycle.result
    1.2 05/10/18 00:48:22 petr@stripped +1 -1
    fix result

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	petr
# Host:	owlet.
# Root:	/home/cps/mysql/trees/mysql-5.0

--- 1.1/mysql-test/r/im_life_cycle.result	2005-10-01 01:14:36 +04:00
+++ 1.2/mysql-test/r/im_life_cycle.result	2005-10-18 00:48:22 +04:00
@@ -21,7 +21,7 @@
 mysqld2	online	VERSION
 SHOW VARIABLES LIKE 'port';
 Variable_name	Value
-port	9312
+port	IM_MYSQLD1_PORT
 STOP INSTANCE mysqld2;
 SHOW INSTANCES;
 instance_name	status

--- 1.1/mysql-test/t/im_life_cycle.imtest	2005-10-01 01:14:39 +04:00
+++ 1.2/mysql-test/t/im_life_cycle.imtest	2005-10-18 00:48:22 +04:00
@@ -46,6 +46,7 @@
 --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