Commit 204086bd authored by Alexander Barkov's avatar Alexander Barkov

Fixing test failure cause by recent changes in ODBC catalogue functions.

modified:
  mysql-test/suite/connect/r/odbc_xls.result
  mysql-test/suite/connect/t/odbc_xls.test
parent ebf2da00
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`Name` varchar(256) DEFAULT NULL, `Name` varchar(256) NOT NULL,
`Description` varchar(256) DEFAULT NULL `Description` varchar(256) NOT NULL
) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=ODBC `OPTION_LIST`='info=yes' ) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=ODBC `CATFUNC`=Sources
CREATE TABLE contact (Nom VARCHAR(128), Fonction VARCHAR(128), Company VARCHAR(128), Repertoire VARCHAR(30)) ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineXLS;DBQ=C:/Users/bar/maria-bzr/maria-10.0-connect/bld/mysql-test/var/mysqld.1/data//test/contacts.xls';; CREATE TABLE contact (Nom VARCHAR(128), Fonction VARCHAR(128), Company VARCHAR(128), Repertoire VARCHAR(30)) ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineXLS;DBQ=C:/Users/bar/maria-bzr/maria-10.0-connect/bld/mysql-test/var/mysqld.1/data//test/contacts.xls';;
SELECT Nom, Fonction FROM contact WHERE Repertoire='ascii'; SELECT Nom, Fonction FROM contact WHERE Repertoire='ascii';
Nom Fonction Nom Fonction
......
--disable_query_log --disable_query_log
CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC OPTION_LIST='info=yes'; CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CATFUNC=Sources;
if (!`SELECT count(*) FROM t1 WHERE Name='ConnectEngineXLS'`) if (!`SELECT count(*) FROM t1 WHERE Name='ConnectEngineXLS'`)
{ {
DROP TABLE t1; DROP TABLE t1;
......
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