diff options
| author | unknown <patg@radha.myhome.westell.com> | 2006-12-12 13:18:49 -0500 |
|---|---|---|
| committer | unknown <patg@radha.myhome.westell.com> | 2006-12-12 13:18:49 -0500 |
| commit | fecde96a4d3cdac192e566e275a8e500448b0e23 (patch) | |
| tree | 67ff5de3697db0ff1d4584de310ad1716ead989f | |
| parent | 6206af42fd544b39d26d78d3f00258dee3516370 (diff) | |
| download | mariadb-git-fecde96a4d3cdac192e566e275a8e500448b0e23.tar.gz | |
WL# 3031
Added --replace-result to avoid hard-coding of port
| -rw-r--r-- | mysql-test/r/federated_server.result | 8 | ||||
| -rw-r--r-- | mysql-test/t/federated_server.test | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/mysql-test/r/federated_server.result b/mysql-test/r/federated_server.result index a8dc9a5a949..7a45666eb0d 100644 --- a/mysql-test/r/federated_server.result +++ b/mysql-test/r/federated_server.result @@ -35,7 +35,7 @@ create server 'server_one' foreign data wrapper 'mysql' options DATABASE 'first_db', USER 'root', PASSWORD '', -PORT 9308, +PORT SLAVE_PORT, SOCKET '', OWNER 'root'); drop server if exists 'server_two'; @@ -44,7 +44,7 @@ create server 'server_two' foreign data wrapper 'mysql' options DATABASE 'second_db', USER 'root', PASSWORD '', -PORT 9308, +PORT SLAVE_PORT, SOCKET '', OWNER 'root'); select * from mysql.servers; @@ -60,7 +60,7 @@ CREATE TABLE federated.old ( `name` varchar(64) NOT NULL default '' ) ENGINE="FEDERATED" DEFAULT CHARSET=latin1 -CONNECTION='mysql://root@127.0.0.1:9308/first_db/t1'; +CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/first_db/t1'; INSERT INTO federated.old (id, name) values (1, 'federated.old url'); SELECT * FROM federated.old; id name @@ -73,7 +73,7 @@ CREATE TABLE federated.old2 ( `name` varchar(64) NOT NULL default '' ) ENGINE="FEDERATED" DEFAULT CHARSET=latin1 -CONNECTION='mysql://root@127.0.0.1:9308/second_db/t1'; +CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/second_db/t1'; INSERT INTO federated.old2 (id, name) values (1, 'federated.old2 url'); DROP TABLE IF EXISTS federated.t1; Warnings: diff --git a/mysql-test/t/federated_server.test b/mysql-test/t/federated_server.test index bfe732c309d..a1982523106 100644 --- a/mysql-test/t/federated_server.test +++ b/mysql-test/t/federated_server.test @@ -26,6 +26,7 @@ CREATE TABLE second_db.t1 ( connection master; drop server if exists 'server_one'; +--replace_result $SLAVE_MYPORT SLAVE_PORT eval create server 'server_one' foreign data wrapper 'mysql' options (HOST '127.0.0.1', DATABASE 'first_db', @@ -36,6 +37,7 @@ eval create server 'server_one' foreign data wrapper 'mysql' options OWNER 'root'); drop server if exists 'server_two'; +--replace_result $SLAVE_MYPORT SLAVE_PORT eval create server 'server_two' foreign data wrapper 'mysql' options (HOST '127.0.0.1', DATABASE 'second_db', @@ -48,6 +50,7 @@ eval create server 'server_two' foreign data wrapper 'mysql' options select * from mysql.servers; DROP TABLE IF EXISTS federated.old; +--replace_result $SLAVE_MYPORT SLAVE_PORT eval CREATE TABLE federated.old ( `id` int(20) NOT NULL, `name` varchar(64) NOT NULL default '' @@ -60,6 +63,7 @@ INSERT INTO federated.old (id, name) values (1, 'federated.old url'); SELECT * FROM federated.old; DROP TABLE IF EXISTS federated.old2; +--replace_result $SLAVE_MYPORT SLAVE_PORT eval CREATE TABLE federated.old2 ( `id` int(20) NOT NULL, `name` varchar(64) NOT NULL default '' |