diff options
| author | Magnus Svensson <msvensson@mysql.com> | 2008-08-08 20:10:43 +0200 |
|---|---|---|
| committer | Magnus Svensson <msvensson@mysql.com> | 2008-08-08 20:10:43 +0200 |
| commit | d7f846be94176b3f13734fbdc360336fb79c5104 (patch) | |
| tree | dbbade1e26954cd7d96983156e6d392fda247207 /mysql-test/t/mysqltest.test | |
| parent | bfcefa1bd8d60c5816a257bd27cac0c14cdea90d (diff) | |
| parent | 1d5e2c8dc41e7261e9cc4d2a6548509c10945d3d (diff) | |
| download | mariadb-git-d7f846be94176b3f13734fbdc360336fb79c5104.tar.gz | |
Merge
Diffstat (limited to 'mysql-test/t/mysqltest.test')
| -rw-r--r-- | mysql-test/t/mysqltest.test | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index 0253b5818ee..ccc40072220 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 # ---------------------------------------------------------------------------- @@ -2119,10 +2123,22 @@ 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; # |