diff options
Diffstat (limited to 'mysql-test/t/mysqltest.test')
| -rw-r--r-- | mysql-test/t/mysqltest.test | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index 5856bfff036..b4b4cf2f308 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -91,6 +91,10 @@ select otto from (select 1 as otto) as t1; --error 1 --exec echo "error S42S22; select otto from (select 1 as otto) as t1;" | $MYSQL_TEST 2>&1 +# expecting a SQL-state for a command that can't give one should fail +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +--error 1 +--exec echo "error S00000; remove_file $MYSQLTEST_VARDIR/tmp/test_nonexistent.tmp;" | $MYSQL_TEST 2>&1 # ---------------------------------------------------------------------------- @@ -2117,12 +2121,31 @@ mkdir $MYSQLTEST_VARDIR/tmp/testdir; write_file $MYSQLTEST_VARDIR/tmp/testdir/file1.txt; hello EOF + +list_files $MYSQLTEST_VARDIR/tmp/testdir; +# list_files gets the directory list before creating the new file +list_files_write_file $MYSQLTEST_VARDIR/tmp/testdir/file2.txt $MYSQLTEST_VARDIR/tmp/testdir *; +list_files_append_file $MYSQLTEST_VARDIR/tmp/testdir/file2.txt $MYSQLTEST_VARDIR/tmp/testdir *2*; +list_files_write_file $MYSQLTEST_VARDIR/tmp/testdir/file2.txt $MYSQLTEST_VARDIR/tmp/testdir file?.txt; +list_files_append_file $MYSQLTEST_VARDIR/tmp/testdir/file3.txt $MYSQLTEST_VARDIR/tmp/testdir file*.txt; +diff_files $MYSQLTEST_VARDIR/tmp/testdir/file2.txt $MYSQLTEST_VARDIR/tmp/testdir/file3.txt; --error 1 rmdir $MYSQLTEST_VARDIR/tmp/testdir; +cat_file $MYSQLTEST_VARDIR/tmp/testdir/file3.txt; + remove_file $MYSQLTEST_VARDIR/tmp/testdir/file1.txt; +remove_file $MYSQLTEST_VARDIR/tmp/testdir/file2.txt; +remove_file $MYSQLTEST_VARDIR/tmp/testdir/file3.txt; rmdir $MYSQLTEST_VARDIR/tmp/testdir; +# +# Bug #36041: mysql-test-run doesn't seem to string match 100% effectively +# on Windows +# + +--replace_result c:\\a.txt z +SELECT 'c:\\a.txt' AS col; --echo End of tests |