diff options
author | Alexander Nozdrin <alik@sun.com> | 2010-07-31 17:10:27 +0400 |
---|---|---|
committer | Alexander Nozdrin <alik@sun.com> | 2010-07-31 17:10:27 +0400 |
commit | bf5b5b05efef24370d2a0e161e7ba2e5480366c1 (patch) | |
tree | 203a774ce18e8879cd3a148d408078fc3bb10912 /mysql-test/suite/federated/federated_server.test | |
parent | 78df66e5719dc8a623b065d0bceab49657ba45c3 (diff) | |
download | mariadb-git-bf5b5b05efef24370d2a0e161e7ba2e5480366c1.tar.gz |
Fix federated.federated_server.test.
Diffstat (limited to 'mysql-test/suite/federated/federated_server.test')
-rw-r--r-- | mysql-test/suite/federated/federated_server.test | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/suite/federated/federated_server.test b/mysql-test/suite/federated/federated_server.test index ec952d071f2..9e883743450 100644 --- a/mysql-test/suite/federated/federated_server.test +++ b/mysql-test/suite/federated/federated_server.test @@ -62,7 +62,7 @@ eval create server 'server_two' foreign data wrapper 'mysql' options OWNER 'root'); --replace_result $SLAVE_MYPORT SLAVE_PORT -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 @@ -147,7 +147,7 @@ drop table federated.t1; drop server 'server_one'; drop server 'server_two'; -select * from mysql.servers; +select * from mysql.servers order by Server_name; connection slave; drop table first_db.t1; @@ -301,6 +301,8 @@ drop server 's1'; connect (other,localhost,root,,); connection master; use test; +create table t1(a int); +insert into t1 values (1); delimiter //; create procedure p1 () begin @@ -316,6 +318,7 @@ begin DROP SERVER s; SET v = v + 1; END WHILE; + select a into @a from t1; # Just reset warnings END// delimiter ;// connection other; @@ -326,6 +329,7 @@ call p1(); connection other; reap; drop procedure p1; +drop table t1; drop server if exists s; |