Commit ebcf6ad9 authored by Olivier Bertrand's avatar Olivier Bertrand

- Fix tests after last modification, in particular support of TINY

modified:
  mysql-test/suite/connect/r/dbf.result
  mysql-test/suite/connect/r/general.result
  mysql-test/suite/connect/r/xml.result
  mysql-test/suite/connect/t/dbf.test
parent 1c4a3eb9
......@@ -291,7 +291,11 @@ CREATE TABLE t1
(
a TINYINT DEFAULT NULL
) ENGINE=CONNECT TABLE_TYPE=DBF FILE_NAME='t1.dbf';
ERROR HY000: Unsupported type for column 'a'
INSERT INTO t1 VALUES (123);
SELECT * FROM t1;
a
123
DROP TABLE t1;
#
# Testing SMALLINT
#
......
......@@ -3,12 +3,11 @@
#
CREATE TABLE t1 (a INT) ENGINE=CONNECT TABLE_TYPE=NON_EXISTING;
Warnings:
Warning 1105 Unknown Table_type 'NON_EXISTING'
Warning 1105 Using Table_type DOS
Warning 1105 Unspecified file name was set to t1.DOS
Warning 1105 No table_type. Was set to DOS
Warning 1105 No file name. Table will use t1.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 `file_name`=t1.DOS
) ENGINE=CONNECT DEFAULT CHARSET=latin1 `table_type`=DOS
DROP TABLE t1;
Warnings:
Warning 1105 Unspecified file name was set to t1.XML
Warning 1105 No file name. Table will use t1.XML
SET NAMES utf8;
#
# Testing tag values
......
......@@ -208,21 +208,17 @@ DROP TABLE t1;
--remove_file $MYSQLD_DATADIR/test/t1.dbf
#
# TODO: TINYINT is not supported
#
--echo #
--echo # Testing TINYINT
--echo #
--error ER_UNKNOWN_ERROR
CREATE TABLE t1
(
a TINYINT DEFAULT NULL
) ENGINE=CONNECT TABLE_TYPE=DBF FILE_NAME='t1.dbf';
#INSERT INTO t1 VALUES (123);
#SELECT * FROM t1;
#DROP TABLE t1;
#--remove_file $MYSQLD_DATADIR/test/t1.dbf
INSERT INTO t1 VALUES (123);
SELECT * FROM t1;
DROP TABLE t1;
--remove_file $MYSQLD_DATADIR/test/t1.dbf
--echo #
......@@ -371,7 +367,7 @@ eval CALL dbf_header('$MYSQLD_DATADIR/test/t1.dbf');
DROP TABLE t1;
--remove_file $MYSQLD_DATADIR/test/t1.dbf
#
# TODO: this return error:
# TODO: this return error:
# Got error 122 'Value 123.0000000000 too long for column a of length 12'
# from CONNECT
#
......@@ -441,7 +437,7 @@ DROP TABLE IF EXISTS t1;
# Testing with no FILE_NAME specified
# Currently it returns:
# ERROR 1296 (HY000): Got error 174 'Open(a+) error 21
# on /opt/mariadb-5.5/data/: Is a directory' from CONNECT
# on /opt/mariadb-5.5/data/: Is a directory' from CONNECT
#CREATE TABLE t1 (a INT) ENGINE=CONNECT TABLE_TYPE=DBF;
--echo #
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment