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 | cdb0e95a5cc38994976f0fac251dd800ce8326b7 (patch) | |
| tree | 600769d848982c763bd9a8ec03c362cd08676fd7 /mysql-test/r/federated.result | |
| parent | dcbf5b586b873ce2e7139aafe0f9195b592c6734 (diff) | |
| parent | 372ef902e6213a7efcd808d20eb081707b421b25 (diff) | |
| download | mariadb-git-cdb0e95a5cc38994976f0fac251dd800ce8326b7.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/r/federated.result')
| -rw-r--r-- | mysql-test/r/federated.result | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mysql-test/r/federated.result b/mysql-test/r/federated.result index 690cc803608..cfb445e9427 100644 --- a/mysql-test/r/federated.result +++ b/mysql-test/r/federated.result @@ -40,17 +40,18 @@ CREATE TABLE federated.t1 ( ) ENGINE="FEDERATED" DEFAULT CHARSET=latin1 CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t3'; -ERROR HY000: Can't create federated table. Foreign data src error: error: 1146 'Table 'federated.t3' doesn't exist' +SELECT * FROM federated.t1; +ERROR HY000: The foreign data source you are trying to reference does not exist. Data source error: error: 1146 'Table 'federated.t3' doesn't exist' +DROP TABLE federated.t1; 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_PORT/federated/t1'; -ERROR HY000: Unable to connect to foreign data source: database: 'federated' username: 'user' hostname: '127.0.0.1' -DROP TABLE IF EXISTS federated.t1; -Warnings: -Note 1051 Unknown table 't1' +SELECT * FROM federated.t1; +ERROR HY000: Unable to connect to foreign data source: Access denied for user 'user'@'localhost' (using password: YES) +DROP TABLE federated.t1; CREATE TABLE federated.t1 ( `id` int(20) NOT NULL, `name` varchar(32) NOT NULL default '' |