Auto-merged.

.bzr-mysql/default.conf

 [MYSQL]
 post_commit_to = "commits@lists.mysql.com"
 post_push_to = "commits@lists.mysql.com"
-tree_name = "mysql-trunk-bugfixing"
+tree_name = "mysql-5.5-bugfixing"

mysql-test/suite/federated/federated_server.result

@@ -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;
@@ -254,6 +254,8 @@ password '', socket '', owner '', port 3306);
 drop server 's1';
 # End of 5.1 tests
 use test;
+create table t1(a int);
+insert into t1 values (1);
 create procedure p1 ()
 begin
 DECLARE v INT DEFAULT 0;
@@ -268,15 +270,13 @@ ALTER SERVER s OPTIONS (USER 'Remote');
 DROP SERVER s;
 SET v = v + 1;
 END WHILE;
+select a into @a from t1; # Just reset warnings
 END//
 use test;
 call p1();
 call p1();
-Warnings:
-Error	1477	The foreign server name you are trying to reference does not exist. Data source error:  s
-Warnings:
-Error	1476	The foreign server, s, you are trying to create already exists.
 drop procedure p1;
+drop table t1;
 drop server if exists s;
 DROP TABLE IF EXISTS federated.t1;
 DROP DATABASE federated;

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;