From 86e68740dd46ae49e91a658cb7209fbadbd0eac9 Mon Sep 17 00:00:00 2001
From: Alexander Nozdrin <alik@sun.com>
Date: Sat, 31 Jul 2010 17:10:27 +0400
Subject: [PATCH 1/3] Fix federated.federated_server.test.
---
mysql-test/suite/federated/federated_server.result | 12 ++++++------
mysql-test/suite/federated/federated_server.test | 8 ++++++--
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/mysql-test/suite/federated/federated_server.result b/mysql-test/suite/federated/federated_server.result
index 422505bdd30..e5cff2bb2bf 100644
--- a/mysql-test/suite/federated/federated_server.result
+++ b/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;
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;
From a34236947817013339787f4bf6252112a1d97e0c Mon Sep 17 00:00:00 2001
From: Alexander Nozdrin <alik@ibmvm>
Date: Wed, 4 Aug 2010 12:14:25 +0400
Subject: [PATCH 2/3] Fix default.conf.
---
.bzr-mysql/default.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.bzr-mysql/default.conf b/.bzr-mysql/default.conf
index fcb3cab2de6..43d479a1043 100644
--- a/.bzr-mysql/default.conf
+++ b/.bzr-mysql/default.conf
@@ -1,4 +1,4 @@
[MYSQL]
post_commit_to = "commits@lists.mysql.com"
post_push_to = "commits@lists.mysql.com"
-tree_name = "mysql-trunk"
+tree_name = "mysql-5.5"
From 265873c7c2e117a4c33bb04fd7102871a55eeb7e Mon Sep 17 00:00:00 2001
From: Alexander Nozdrin <alik@ibmvm>
Date: Wed, 4 Aug 2010 13:14:09 +0400
Subject: [PATCH 3/3] Fix default.conf.
---
.bzr-mysql/default.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.bzr-mysql/default.conf b/.bzr-mysql/default.conf
index 43d479a1043..7d0379c08a0 100644
--- a/.bzr-mysql/default.conf
+++ b/.bzr-mysql/default.conf
@@ -1,4 +1,4 @@
[MYSQL]
post_commit_to = "commits@lists.mysql.com"
post_push_to = "commits@lists.mysql.com"
-tree_name = "mysql-5.5"
+tree_name = "mysql-5.5-bugfixing"