diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2013-07-12 11:18:54 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2013-07-12 11:18:54 +0200 |
| commit | 12f3cb01e9e32516564101795c8bf17a7cb4b5cc (patch) | |
| tree | df842b73fdc75368d712bfe66a2f29bbfdffe335 /storage/connect | |
| parent | 9492c7f15c8b45ebd2b811e2b92aa35f3c807b2c (diff) | |
| download | mariadb-git-12f3cb01e9e32516564101795c8bf17a7cb4b5cc.tar.gz | |
- Fix "Result content mismatch"
modified:
storage/connect/mysql-test/connect/r/mysql.result
storage/connect/mysql-test/connect/t/mysql.test
Diffstat (limited to 'storage/connect')
| -rw-r--r-- | storage/connect/mysql-test/connect/r/mysql.result | 2 | ||||
| -rw-r--r-- | storage/connect/mysql-test/connect/t/mysql.test | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/storage/connect/mysql-test/connect/r/mysql.result b/storage/connect/mysql-test/connect/r/mysql.result index 602f20dd025..aa40c91c6d1 100644 --- a/storage/connect/mysql-test/connect/r/mysql.result +++ b/storage/connect/mysql-test/connect/r/mysql.result @@ -16,7 +16,7 @@ Table Create Table t2 CREATE TABLE `t2` ( `a` int(11) DEFAULT NULL, `y` char(10) DEFAULT NULL -) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=MYSQL `TABNAME`='t1' `OPTION_LIST`='host=localhost,user=root,port=16020' +) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=MYSQL `TABNAME`='t1' `OPTION_LIST`='host=localhost,user=root,port=PORT' SELECT * FROM t2; ERROR HY000: Got error 174 '(1054) Unknown column 'y' in 'field list' [SELECT `a`, `y` FROM `t1`]' from CONNECT DROP TABLE t2; diff --git a/storage/connect/mysql-test/connect/t/mysql.test b/storage/connect/mysql-test/connect/t/mysql.test index 9f8660467d9..c7d7cafe51b 100644 --- a/storage/connect/mysql-test/connect/t/mysql.test +++ b/storage/connect/mysql-test/connect/t/mysql.test @@ -55,10 +55,9 @@ SELECT * FROM t1; #SHOW CREATE TABLE t2;
# Bad column name
-#--replace_result $PORT PORT
-#--eval CREATE TABLE t2 (x int, y char(10)) ENGINE=CONNECT TABLE_TYPE=MYSQL TABNAME='t1' OPTION_LIST='host=localhost,user=root,port=$PORT'
--replace_result $PORT PORT
--eval CREATE TABLE t2 (a int, y char(10)) ENGINE=CONNECT TABLE_TYPE=MYSQL TABNAME='t1' OPTION_LIST='host=localhost,user=root,port=$PORT'
+--replace_result $PORT PORT
SHOW CREATE TABLE t2;
--error ER_GET_ERRMSG
SELECT * FROM t2;
@@ -68,7 +67,6 @@ DROP TABLE t2; --replace_result $PORT PORT
--eval CREATE TABLE t2 (a int, b char(10)) ENGINE=CONNECT TABLE_TYPE=MYSQL TABNAME='t1' OPTION_LIST='host=localhost,user=root,port=$PORT'
ALTER TABLE t1 RENAME t1backup;
-#--error ER_NO_SUCH_TABLE
--error ER_GET_ERRMSG
SELECT * FROM t2;
ALTER TABLE t1backup RENAME t1;
|