diff options
| author | unknown <ingo@mysql.com> | 2006-06-29 13:43:56 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2006-06-29 13:43:56 +0200 |
| commit | 66f650b9317755a0b47dcc3449d9f35d3d91bae2 (patch) | |
| tree | acba3f556478f1d37361d83913f3fa886a5bbdd1 /mysql-test/t/federated.test | |
| parent | 916c39888f92d7ae1f40e1755b0cf566e5b4a219 (diff) | |
| parent | 4c23783cdd3463695889a60bf7c7a45bfe99ec70 (diff) | |
| download | mariadb-git-66f650b9317755a0b47dcc3449d9f35d3d91bae2.tar.gz | |
Merge mysql.com:/home/mydev/mysql-5.0--main
into mysql.com:/home/mydev/mysql-5.0-bug11824
mysql-test/r/federated.result:
Auto merged
mysql-test/t/federated.test:
Auto merged
Diffstat (limited to 'mysql-test/t/federated.test')
| -rw-r--r-- | mysql-test/t/federated.test | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/federated.test b/mysql-test/t/federated.test index f997611dbc0..479cb2ac770 100644 --- a/mysql-test/t/federated.test +++ b/mysql-test/t/federated.test @@ -1324,6 +1324,7 @@ create table federated.t2 (id int, c1 varchar(20), c2 varchar(20)); connection master; --replace_result $SLAVE_MYPORT SLAVE_PORT eval create table federated.t1 (i1 int, i2 int, i3 int) ENGINE=FEDERATED CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1'; +--replace_result $SLAVE_MYPORT SLAVE_PORT eval create table federated.t2 (id int, c1 varchar(20), c2 varchar(20)) ENGINE=FEDERATED CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t2'; insert into federated.t1 values (1,5,10),(3,7,12),(4,5,2),(9,10,15),(2,2,2); insert into federated.t2 values (9,"abc","def"),(5,"opq","lmn"),(2,"test t","t test"); @@ -1347,6 +1348,7 @@ create table federated.t2 (id int, c1 varchar(20), c2 varchar(20), primary key ( connection master; --replace_result $SLAVE_MYPORT SLAVE_PORT eval create table federated.t1 (i1 int auto_increment not null, i2 int, i3 int, primary key (i1)) ENGINE=FEDERATED CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1'; +--replace_result $SLAVE_MYPORT SLAVE_PORT eval create table federated.t2 (id int auto_increment not null, c1 varchar(20), c2 varchar(20), primary key(id)) ENGINE=FEDERATED CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t2'; insert into federated.t1 values (1,5,10),(3,7,12),(4,5,2),(9,10,15),(2,2,2); insert into federated.t2 values (9,"abc","def"),(5,"opq","lmn"),(2,"test t","t test"); |