1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adding forgotten "--replace_result $MYSQLD_DATADIR DATADIR",

Browse Source 
so it passed idependently from the source tree location.

modified:
  mysql-test/suite/connect/r/odbc_xls.result
  mysql-test/suite/connect/t/odbc_xls.test
This commit is contained in:
Alexander Barkov 2013-02-14 11:57:38 +04:00
parent 3f2d762aa8
commit 7bc69b7ada
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/connect/r/odbc_xls.result
View File

@ -3,7 +3,7 @@ t1 CREATE TABLE `t1` (
`Name` varchar(256) NOT NULL,
`Description` varchar(256) NOT NULL
) 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=DATADIR/test/contacts.xls';;
SELECT Nom, Fonction FROM contact WHERE Repertoire='ascii';
Nom Fonction
Du Halgouet Tanguy

1
mysql-test/suite/connect/t/odbc_xls.test
View File

@ -13,6 +13,7 @@ let $MYSQLD_DATADIR= `select @@datadir`;
--copy_file $MYSQL_TEST_DIR/suite/connect/std_data/contacts.xls $MYSQLD_DATADIR/test/contacts.xls
--replace_result $MYSQLD_DATADIR DATADIR
--eval CREATE TABLE contact (Nom VARCHAR(128), Fonction VARCHAR(128), Company VARCHAR(128), Repertoire VARCHAR(30)) ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineXLS;DBQ=$MYSQLD_DATADIR/test/contacts.xls';
SELECT Nom, Fonction FROM contact WHERE Repertoire='ascii';
DROP TABLE contact;