bk commit into 5.0 tree (knielsen:1.2018)

[knielsen]

Below is the list of changes that have just been committed into a local
5.0 repository of knielsen. When knielsen 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.2018 06/01/31 09:15:28 knielsen@stripped +2 -0
  Fix missing --replace_result on $SLAVE_MYPORT in federated.

  mysql-test/r/federated.result
    1.25 06/01/31 09:15:01 knielsen@stripped +1 -1
    Fix missing --replace_result on $SLAVE_MYPORT to work with MTR_BUILD_THREAD.

  mysql-test/t/federated.test
    1.21 06/01/31 09:14:53 knielsen@stripped +1 -0
    Fix missing --replace_result on $SLAVE_MYPORT to work with MTR_BUILD_THREAD.

# 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:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/mysql-5.0

--- 1.24/mysql-test/r/federated.result	2006-01-28 00:43:40 +01:00
+++ 1.25/mysql-test/r/federated.result	2006-01-31 09:15:01 +01:00
@@ -1530,7 +1530,7 @@
 PRIMARY KEY  (`id`)
 )
 ENGINE="FEDERATED" DEFAULT CHARSET=latin1
-CONNECTION='mysql://root@stripped:9308/federated/t1';
+CONNECTION='mysql://root@stripped:SLAVE_PORT/federated/t1';
 INSERT INTO federated.t1 VALUES ();
 SELECT LAST_INSERT_ID();
 LAST_INSERT_ID()

--- 1.20/mysql-test/t/federated.test	2006-01-28 00:43:40 +01:00
+++ 1.21/mysql-test/t/federated.test	2006-01-31 09:14:53 +01:00
@@ -1235,6 +1235,7 @@
 
 connection master;
 DROP TABLE IF EXISTS federated.t1;
+--replace_result $SLAVE_MYPORT SLAVE_PORT
 eval CREATE TABLE federated.t1 (
     `id` int(20) NOT NULL auto_increment,
     PRIMARY KEY  (`id`)