Commit 13b26548 authored by Hemant Kumar's avatar Hemant Kumar

Bug#12872803 - 62154: FEDERATED.FEDERATED_SERVER TEST FAILS WITH RUN --REPEAT=2

Fixed it to work with "--repeat" option.
parent b03c1541
...@@ -54,7 +54,7 @@ PASSWORD '', ...@@ -54,7 +54,7 @@ PASSWORD '',
PORT SLAVE_PORT, PORT SLAVE_PORT,
SOCKET '', SOCKET '',
OWNER 'root'); OWNER 'root');
select * from mysql.servers; select * from mysql.servers order by Server_name;
Server_name Host Db Username Password Port Socket Wrapper Owner Server_name Host Db Username Password Port Socket Wrapper Owner
server_one 127.0.0.1 first_db root SLAVE_PORT mysql root server_one 127.0.0.1 first_db root SLAVE_PORT mysql root
server_two 127.0.0.1 second_db root SLAVE_PORT mysql root server_two 127.0.0.1 second_db root SLAVE_PORT mysql root
...@@ -154,7 +154,7 @@ id name ...@@ -154,7 +154,7 @@ id name
drop table federated.t1; drop table federated.t1;
drop server 'server_one'; drop server 'server_one';
drop server 'server_two'; drop server 'server_two';
select * from mysql.servers; select * from mysql.servers order by Server_name;
Server_name Host Db Username Password Port Socket Wrapper Owner Server_name Host Db Username Password Port Socket Wrapper Owner
drop table first_db.t1; drop table first_db.t1;
drop table second_db.t1; drop table second_db.t1;
......
...@@ -62,7 +62,9 @@ eval create server 'server_two' foreign data wrapper 'mysql' options ...@@ -62,7 +62,9 @@ eval create server 'server_two' foreign data wrapper 'mysql' options
OWNER 'root'); OWNER 'root');
--replace_result $SLAVE_MYPORT SLAVE_PORT --replace_result $SLAVE_MYPORT SLAVE_PORT
eval select * from mysql.servers; # Adding 'order by' clause here, in order to maintain consistent result out of the select query.
#eval select * from mysql.servers;
eval select * from mysql.servers order by Server_name;
DROP TABLE IF EXISTS federated.old; DROP TABLE IF EXISTS federated.old;
--replace_result $SLAVE_MYPORT SLAVE_PORT --replace_result $SLAVE_MYPORT SLAVE_PORT
...@@ -147,7 +149,9 @@ drop table federated.t1; ...@@ -147,7 +149,9 @@ drop table federated.t1;
drop server 'server_one'; drop server 'server_one';
drop server 'server_two'; drop server 'server_two';
select * from mysql.servers; # Adding 'order by' clause here, in order to maintain consistent result out of the select query.
#select * from mysql.servers;
eval select * from mysql.servers order by Server_name;
connection slave; connection slave;
drop table first_db.t1; drop table first_db.t1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment