database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fixing test failure due to not strict order of the files.

Browse Source 
Adding ORDER BY clause.

modified:
  mysql-test/suite/connect/r/dir.result
  mysql-test/suite/connect/t/dir.test
This commit is contained in:
Alexander Barkov
2013-02-20 18:27:04 +04:00
parent d99d3da1d1
commit d0145eed7c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/suite/connect/r/dir.result
View File

@ -7,11 +7,11 @@ size DOUBLE(12,0) flag=5
OPTION_LIST='subdir=1';
SELECT * FROM t1;
path fname ftype size
SELECT fname, ftype, size FROM t1;
SELECT fname, ftype, size FROM t1 ORDER BY fname, ftype, size;
fname ftype size
boys .txt 282
boyswin .txt 288
boys2 .txt 282
boyswin .txt 288
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
@ -23,7 +23,7 @@ t1 CREATE TABLE `t1` (
`ftype` char(4) DEFAULT NULL,
`size` double(12,0) DEFAULT NULL `flag`=5
) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=DIR `FILE_NAME`='*.txt' `OPTION_LIST`='subdir=0'
SELECT fname, ftype, size FROM t1;
SELECT fname, ftype, size FROM t1 ORDER BY fname, ftype, size;
fname ftype size
boys .txt 282
boyswin .txt 288

4
mysql-test/suite/connect/t/dir.test
View File

@ -17,11 +17,11 @@ SELECT * FROM t1;
--mkdir $MYSQLD_DATADIR/test/subdir/
--copy_file $MYSQLD_DATADIR/test/boys.txt $MYSQLD_DATADIR/test/subdir/boys2.txt
--replace_result $MYSQLD_DATADIR DATADIR/
SELECT fname, ftype, size FROM t1;
SELECT fname, ftype, size FROM t1 ORDER BY fname, ftype, size;
ALTER TABLE t1 OPTION_LIST='subdir=0';
SHOW CREATE TABLE t1;
--replace_result $MYSQLD_DATADIR DATADIR/
SELECT fname, ftype, size FROM t1;
SELECT fname, ftype, size FROM t1 ORDER BY fname, ftype, size;
# TODO: add a better error message
--error ER_GET_ERRMSG