diff options
| author | unknown <acurtis/antony@ltamd64.xiphis.org> | 2007-07-25 12:29:44 -0700 |
|---|---|---|
| committer | unknown <acurtis/antony@ltamd64.xiphis.org> | 2007-07-25 12:29:44 -0700 |
| commit | c6a0b22419e107992a1c8724b902439aa2755dc0 (patch) | |
| tree | 600769d848982c763bd9a8ec03c362cd08676fd7 /mysql-test/t/federated.test | |
| parent | 34864af8fd6b12d507d34c0f1b29167cc23928b2 (diff) | |
| parent | b42247bca84d7ae76e0d46420ee03fc8e31b3de2 (diff) | |
| download | mariadb-git-c6a0b22419e107992a1c8724b902439aa2755dc0.tar.gz | |
Merge xiphis.org:/anubis/antony/work/p2-bug25679.3
into xiphis.org:/anubis/antony/work/p2-bug25679.3.merge-5.1
mysql-test/r/federated.result:
Auto merged
mysql-test/t/federated.test:
Auto merged
storage/federated/ha_federated.h:
Auto merged
storage/federated/ha_federated.cc:
manual merge 5.0 to 5.1
Diffstat (limited to 'mysql-test/t/federated.test')
| -rw-r--r-- | mysql-test/t/federated.test | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mysql-test/t/federated.test b/mysql-test/t/federated.test index d54934a2e73..efca7f3232d 100644 --- a/mysql-test/t/federated.test +++ b/mysql-test/t/federated.test @@ -32,25 +32,28 @@ CREATE TABLE federated.t1 ( # test non-existant table --replace_result $SLAVE_MYPORT SLAVE_PORT ---error 1434 eval CREATE TABLE federated.t1 ( `id` int(20) NOT NULL, `name` varchar(32) NOT NULL default '' ) ENGINE="FEDERATED" DEFAULT CHARSET=latin1 CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t3'; +--error 1431 +SELECT * FROM federated.t1; +DROP TABLE federated.t1; # test bad user/password --replace_result $SLAVE_MYPORT SLAVE_PORT ---error 1429 eval CREATE TABLE federated.t1 ( `id` int(20) NOT NULL, `name` varchar(32) NOT NULL default '' ) ENGINE="FEDERATED" DEFAULT CHARSET=latin1 CONNECTION='mysql://user:pass@127.0.0.1:$SLAVE_MYPORT/federated/t1'; +--error 1429 +SELECT * FROM federated.t1; +DROP TABLE federated.t1; -DROP TABLE IF EXISTS federated.t1; # # correct connection, same named tables --replace_result $SLAVE_MYPORT SLAVE_PORT eval CREATE TABLE federated.t1 ( |