1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix federated.federated_server.test.

Browse Source
This commit is contained in:
Alexander Nozdrin 2010-07-31 17:10:27 +04:00
parent 78df66e571
commit bf5b5b05ef
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/suite/federated/federated_server.result
View File

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

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

@ -62,7 +62,7 @@ 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; 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 +147,7 @@ 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;
connection slave; connection slave;
drop table first_db.t1; drop table first_db.t1;
@ -301,6 +301,8 @@ drop server 's1';
connect (other,localhost,root,,); connect (other,localhost,root,,);
connection master; connection master;
use test; use test;
create table t1(a int);
insert into t1 values (1);
delimiter //; delimiter //;
create procedure p1 () create procedure p1 ()
begin begin
@ -316,6 +318,7 @@ begin
DROP SERVER s; DROP SERVER s;
SET v = v + 1; SET v = v + 1;
END WHILE; END WHILE;
select a into @a from t1; # Just reset warnings
END// END//
delimiter ;// delimiter ;//
connection other; connection other;
@ -326,6 +329,7 @@ call p1();
connection other; connection other;
reap; reap;
drop procedure p1; drop procedure p1;
drop table t1;
drop server if exists s; drop server if exists s;