diff --git a/mysql-test/suite/connect/r/bin.result b/mysql-test/suite/connect/r/bin.result index dfc4d128b8a1221ae5df3daa3aab2f87e700198e..0b0af42097d231e10b10c071f850dd0c964cd910 100644 --- a/mysql-test/suite/connect/r/bin.result +++ b/mysql-test/suite/connect/r/bin.result @@ -50,7 +50,7 @@ INSERT INTO t1 VALUES (7777,'BILL','1973-06-30',4444,5555.555,777); ERROR HY000: Got error 174 'Cannot modify this read/only protected table' from CONNECT ALTER TABLE t1 READONLY=NO; Warnings: -Warning 1105 No check done for compatible changes, you are on your own! +Warning 1105 The current version of CONNECT did not check what you changed in ALTER. Use on your own risk SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -71,7 +71,7 @@ fig name birth id salary dept 7777 BILL 1973-06-30 4444 5555.56 777 ALTER TABLE t1 READONLY=YES; Warnings: -Warning 1105 No check done for compatible changes, you are on your own! +Warning 1105 The current version of CONNECT did not check what you changed in ALTER. Use on your own risk SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( diff --git a/mysql-test/suite/connect/r/csv.result b/mysql-test/suite/connect/r/csv.result index 9e6e4a9e6648a2e9a5e37b16e9a6b72a4d79b140..0624976a4f0a07319cb06cab86103ece6dd5eb30 100644 --- a/mysql-test/suite/connect/r/csv.result +++ b/mysql-test/suite/connect/r/csv.result @@ -63,7 +63,7 @@ Nabucho 2003-08-12 2 RONALD 1980-02-26 4 ALTER TABLE t1 READONLY=no; Warnings: -Warning 1105 No check done for compatible changes, you are on your own! +Warning 1105 The current version of CONNECT did not check what you changed in ALTER. Use on your own risk SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -80,7 +80,7 @@ RONALD 1980-02-26 4 BILL 1973-06-30 5 ALTER TABLE t1 READONLY=1; Warnings: -Warning 1105 No check done for compatible changes, you are on your own! +Warning 1105 The current version of CONNECT did not check what you changed in ALTER. Use on your own risk SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( diff --git a/mysql-test/suite/connect/r/dbf.result b/mysql-test/suite/connect/r/dbf.result index 619f5004a54df0f6f95b3303b3765c248173bbd6..c3a16ffc7caf7b5fb7bec4169a4df6b2b2f110bb 100644 --- a/mysql-test/suite/connect/r/dbf.result +++ b/mysql-test/suite/connect/r/dbf.result @@ -13,11 +13,10 @@ Warnings: Warning 1105 Open(rb) error 2 on DATADIR/test/t1.dbf: No such file or directory DROP TABLE t1; CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=DBF FILE_NAME='t1.dbf'; -ERROR 42000: A table must have at least 1 column +ERROR HY000: Cannot open DATADIR/test/t1.dbf SHOW WARNINGS; Level Code Message -Warning 1105 Cannot open DATADIR/test/t1.dbf -Error 1113 A table must have at least 1 column +Error 1105 Cannot open DATADIR/test/t1.dbf CREATE PROCEDURE test.dbf_field(in fieldno INT, in content BLOB) DETERMINISTIC BEGIN SELECT '---'; @@ -70,7 +69,7 @@ a 20 ALTER TABLE t1 READONLY=Yes; Warnings: -Warning 1105 No check done for compatible changes, you are on your own! +Warning 1105 The current version of CONNECT did not check what you changed in ALTER. Use on your own risk SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -86,7 +85,7 @@ TRUNCATE TABLE t1; ERROR HY000: Got error 174 'Cannot modify this read/only protected table' from CONNECT ALTER TABLE t1 READONLY=NO; Warnings: -Warning 1105 No check done for compatible changes, you are on your own! +Warning 1105 The current version of CONNECT did not check what you changed in ALTER. Use on your own risk SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( diff --git a/mysql-test/suite/connect/r/dir.result b/mysql-test/suite/connect/r/dir.result index f29d2d243585f19a717558e0ade6b5cdfeef3661..0d677723a8bad2e63b0fb137ba347f44977c71cf 100644 --- a/mysql-test/suite/connect/r/dir.result +++ b/mysql-test/suite/connect/r/dir.result @@ -13,6 +13,8 @@ boys .txt 282 boyswin .txt 288 boys2 .txt 282 ALTER TABLE t1 OPTION_LIST='subdir=0'; +Warnings: +Warning 1105 The current version of CONNECT did not check what you changed in ALTER. Use on your own risk SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -29,4 +31,4 @@ INSERT INTO t1 VALUES ('','','',''); ERROR HY000: Got error 174 'COLBLK SetBuffer: undefined Access Method' from CONNECT DROP TABLE t1; CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=DIR FILE_NAME='*.txt'; -ERROR 42000: A table must have at least 1 column +ERROR HY000: Cannot get column info for table type DIR diff --git a/mysql-test/suite/connect/r/fix.result b/mysql-test/suite/connect/r/fix.result index 27cd250db3eb989c73363b55f3b1bb28911ddf90..92914b5cf27ba47aea88ec04cab005d65beb482d 100644 --- a/mysql-test/suite/connect/r/fix.result +++ b/mysql-test/suite/connect/r/fix.result @@ -23,7 +23,7 @@ id 10 ALTER TABLE t1 READONLY=1; Warnings: -Warning 1105 No check done for compatible changes, you are on your own! +Warning 1105 The current version of CONNECT did not check what you changed in ALTER. Use on your own risk SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -39,7 +39,7 @@ TRUNCATE TABLE t1; ERROR HY000: Got error 174 'Cannot modify this read/only protected table' from CONNECT ALTER TABLE t1 READONLY=0; Warnings: -Warning 1105 No check done for compatible changes, you are on your own! +Warning 1105 The current version of CONNECT did not check what you changed in ALTER. Use on your own risk SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( diff --git a/mysql-test/suite/connect/r/general.result b/mysql-test/suite/connect/r/general.result index 24ae9c277a40d0844832ea83276adb2b26321107..cd8e73598cbd7962f86cf46927ab3c86247712b5 100644 --- a/mysql-test/suite/connect/r/general.result +++ b/mysql-test/suite/connect/r/general.result @@ -2,4 +2,12 @@ # Testing features not specific to any TABLE_TYPE # CREATE TABLE t1 (a INT) ENGINE=CONNECT TABLE_TYPE=NON_EXISTING; -ERROR HY000: Unsupported table type NON_EXISTING +Warnings: +Warning 1105 Unknown Table_type 'NON_EXISTING' +Warning 1105 Using Table_type DOS +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL +) ENGINE=CONNECT DEFAULT CHARSET=latin1 `table_type`=DOS +DROP TABLE t1; diff --git a/mysql-test/suite/connect/r/ini.result b/mysql-test/suite/connect/r/ini.result index deb6a2fe0ec6b6780b88daec2165419cb0a80cae..2e56779f525b51160e01a2783360df7bef1f54a6 100644 --- a/mysql-test/suite/connect/r/ini.result +++ b/mysql-test/suite/connect/r/ini.result @@ -186,7 +186,7 @@ FR 20 RU 30 ALTER TABLE t1 READONLY=1; Warnings: -Warning 1105 No check done for compatible changes, you are on your own! +Warning 1105 The current version of CONNECT did not check what you changed in ALTER. Use on your own risk SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -203,7 +203,7 @@ TRUNCATE TABLE t1; ERROR HY000: Got error 174 'Cannot modify this read/only protected table' from CONNECT ALTER TABLE t1 READONLY=0; Warnings: -Warning 1105 No check done for compatible changes, you are on your own! +Warning 1105 The current version of CONNECT did not check what you changed in ALTER. Use on your own risk SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( diff --git a/mysql-test/suite/connect/r/vec.result b/mysql-test/suite/connect/r/vec.result index 8136f9203ad1669c3e44c375ca7b75029c66bfa3..d5cbc0e22cbcb55d1e27cca29dfdb25cda5ab11a 100644 --- a/mysql-test/suite/connect/r/vec.result +++ b/mysql-test/suite/connect/r/vec.result @@ -95,7 +95,7 @@ t1vec .blk 8 # ALTER TABLE t1 READONLY=yes; Warnings: -Warning 1105 No check done for compatible changes, you are on your own! +Warning 1105 The current version of CONNECT did not check what you changed in ALTER. Use on your own risk SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -112,7 +112,7 @@ TRUNCATE TABLE t1; ERROR HY000: Got error 174 'Cannot modify this read/only protected table' from CONNECT ALTER TABLE t1 READONLY=no; Warnings: -Warning 1105 No check done for compatible changes, you are on your own! +Warning 1105 The current version of CONNECT did not check what you changed in ALTER. Use on your own risk SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( diff --git a/mysql-test/suite/connect/t/dbf.test b/mysql-test/suite/connect/t/dbf.test index ded27f3b44390e6e1335aaae50decedb0ae6428e..a4b941c4c0a4f11231e649f479fd0dc6d9f84dce 100644 --- a/mysql-test/suite/connect/t/dbf.test +++ b/mysql-test/suite/connect/t/dbf.test @@ -10,7 +10,8 @@ SHOW CREATE TABLE t1; SELECT * FROM t1; DROP TABLE t1; ---error ER_TABLE_MUST_HAVE_COLUMNS +--replace_regex /Cannot open .*test.t1.dbf/Cannot open DATADIR\/test\/t1.dbf/ +--error ER_UNKNOWN_ERROR CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=DBF FILE_NAME='t1.dbf'; --replace_regex /Cannot open .*test.t1.dbf/Cannot open DATADIR\/test\/t1.dbf/ SHOW WARNINGS; diff --git a/mysql-test/suite/connect/t/dir.test b/mysql-test/suite/connect/t/dir.test index aed3928a9951e88b1d04815a0576e1ca61671328..9549d9bc2fa54a8f478c248657e50b8044dbfb8c 100644 --- a/mysql-test/suite/connect/t/dir.test +++ b/mysql-test/suite/connect/t/dir.test @@ -30,7 +30,7 @@ INSERT INTO t1 VALUES ('','','',''); DROP TABLE t1; # TODO: automatically add columns ---error ER_TABLE_MUST_HAVE_COLUMNS +--error ER_UNKNOWN_ERROR CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=DIR FILE_NAME='*.txt'; diff --git a/mysql-test/suite/connect/t/general.test b/mysql-test/suite/connect/t/general.test index 1c3314301f958d7891ca3692520a923d2e48f6a1..4f40980515ccff39cadd6cfc4dc35510447c6358 100644 --- a/mysql-test/suite/connect/t/general.test +++ b/mysql-test/suite/connect/t/general.test @@ -2,8 +2,9 @@ --echo # Testing features not specific to any TABLE_TYPE --echo # ---error ER_UNKNOWN_ERROR CREATE TABLE t1 (a INT) ENGINE=CONNECT TABLE_TYPE=NON_EXISTING; +SHOW CREATE TABLE t1; +DROP TABLE t1; #CREATE TABLE t1 (a INT) ENGINE=CONNECT TABLE_TYPE=FIX FILE_NAME='t1.txt'; #INSERT INTO t1 VALUES (10);