replace port number with string identifier so that it may have different ports and still run

(problem found by kent)


mysql-test/r/federated.result:
  replace port number with a named identifier
mysql-test/t/federated.test:
  add call to replace the resulting display of the port number with a string

2 files changed, 3 insertions, 2 deletions

diff --git a/mysql-test/r/federated.result b/mysql-test/r/federated.result
index f40919a41a4..29f8461fd4c 100644
--- a/mysql-test/r/federated.result
+++ b/mysql-test/r/federated.result
@@ -79,7 +79,7 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `id` int(20) NOT NULL,
   `name` varchar(32) NOT NULL default ''
-) ENGINE=FEDERATED DEFAULT CHARSET=latin1 CONNECTION='mysql://root@127.0.0.1:9308/federated/t1'
+) ENGINE=FEDERATED DEFAULT CHARSET=latin1 CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1'
 INSERT INTO federated.t2 (id, name) VALUES (1, 'foo');
 INSERT INTO federated.t2 (id, name) VALUES (2, 'fee');
 SELECT * FROM federated.t2;
diff --git a/mysql-test/t/federated.test b/mysql-test/t/federated.test
index 453343e6f09..b1b6baa2f33 100644
--- a/mysql-test/t/federated.test
+++ b/mysql-test/t/federated.test
@@ -75,7 +75,8 @@ eval CREATE TABLE federated.t2 (
   ENGINE="FEDERATED" DEFAULT CHARSET=latin1
   CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
 
-SHOW CREATE TABLE federated.t2;
+--replace_result $SLAVE_MYPORT SLAVE_PORT
+eval SHOW CREATE TABLE federated.t2;
 
 INSERT INTO federated.t2 (id, name) VALUES (1, 'foo');
 INSERT INTO federated.t2 (id, name) VALUES (2, 'fee');