Recording error messages according to the last change from Olivier.

modified: mysql-test/suite/connect/r/bin.result mysql-test/suite/connect/r/csv.result mysql-test/suite/connect/r/dbf.result mysql-test/suite/connect/r/dir.result mysql-test/suite/connect/r/fix.result mysql-test/suite/connect/r/general.result mysql-test/suite/connect/r/ini.result mysql-test/suite/connect/r/vec.result mysql-test/suite/connect/t/dbf.test mysql-test/suite/connect/t/dir.test mysql-test/suite/connect/t/general.test
2025-07-30 16:24:05 +03:00 · 2013-02-15 09:42:10 +04:00
parent 33b2c6fe7b
commit 70e92c855e
11 changed files with 31 additions and 20 deletions
--- 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` (
--- 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` (
--- 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` (
--- 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
--- 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` (
--- 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;
--- 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` (
--- 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` (
--- 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;
--- 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';


--- 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);