Commit fe8c5bf7 authored by Sergey Petrunia's avatar Sergey Petrunia
Browse files

Fix others' merge error in federated.{test,result}

parent 53abe494

mysql-test/r/federated.result

+4 −5
Original line number Diff line number Diff line
@@ -2121,7 +2121,6 @@ DROP TABLE t1; 
CREATE TABLE t1 (a LONGBLOB, b LONGBLOB);

INSERT INTO t1 VALUES ('aaaaaaaaaaaaaaaaaaaaaaaaaaaa', NULL);

CREATE TABLE t1



(a LONGBLOB, b LONGBLOB) ENGINE=FEDERATED

CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/test/t1';

CHECKSUM TABLE t1;
@@ -2129,11 +2128,11 @@ Table Checksum 
test.t1	2465757603

DROP TABLE t1;

DROP TABLE t1;

DROP TABLE IF EXISTS federated.t1;

DROP DATABASE IF EXISTS federated;

DROP TABLE IF EXISTS federated.t1;

DROP DATABASE IF EXISTS federated;

End of 5.0 tests

create server 's1' foreign data wrapper 'mysql' options (port 3306);

drop server 's1';

End of 5.1 tests

DROP TABLE IF EXISTS federated.t1;

DROP DATABASE IF EXISTS federated;

DROP TABLE IF EXISTS federated.t1;

DROP DATABASE IF EXISTS federated;

mysql-test/t/federated.test

+1 −0
Original line number Diff line number Diff line
@@ -1882,5 +1882,6 @@ connection default; 


create server 's1' foreign data wrapper 'mysql' options (port 3306);

drop server 's1';



--echo End of 5.1 tests

source include/federated_cleanup.inc;