mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-08 08:04:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

mysql-5.1.62 merge

Browse source
This commit is contained in:
Sergei Golubchik 2012-04-05 10:49:38 +02:00
commit dea3544b2d
268 changed files with 6715 additions and 5654 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mysql-test/suite/federated/federated_server.result
View file

@ -54,7 +54,7 @@ PASSWORD '',
PORT SLAVE_PORT,
SOCKET '',
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_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
@ -154,7 +154,7 @@ id name
drop table federated.t1;
drop server 'server_one';
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
drop table first_db.t1;
drop table second_db.t1;

8
mysql-test/suite/federated/federated_server.test
View file

@ -66,7 +66,9 @@ eval create server 'server_two' foreign data wrapper 'mysql' options
OWNER 'root');
--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;
--replace_result $SLAVE_MYPORT SLAVE_PORT
@ -151,7 +153,9 @@ drop table federated.t1;
drop server 'server_one';
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;
drop table first_db.t1;