diff options
author | unknown <msvensson@pilot.blaudden> | 2007-02-19 18:20:33 +0100 |
---|---|---|
committer | unknown <msvensson@pilot.blaudden> | 2007-02-19 18:20:33 +0100 |
commit | 8cb50382d4d71ccf77170a07d582a26e6154c3a8 (patch) | |
tree | 255235c7225a8962cf071a2b82c92a971691d0ce /mysql-test/t/mysqltest.test | |
parent | 2b46c20a7d722c3654d5bf219a837a28c84cc1b3 (diff) | |
parent | 8d7e8d971580c4b35d49e9dcb7b27834ff29fd7e (diff) | |
download | mariadb-git-8cb50382d4d71ccf77170a07d582a26e6154c3a8.tar.gz |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
client/mysqltest.c:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/r/mysqltest.result:
SCCS merged
Diffstat (limited to 'mysql-test/t/mysqltest.test')
-rw-r--r-- | mysql-test/t/mysqltest.test | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index 2a5fc82b3e7..a50d8b773ec 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -1550,6 +1550,20 @@ Appended text on nonexisting file EOF # ---------------------------------------------------------------------------- +# test for cat_file +# ---------------------------------------------------------------------------- + +--write_file $MYSQLTEST_VARDIR/tmp/test_file1.tmp +Some data +for cat_file command +of mysqltest +EOF +cat_file $MYSQLTEST_VARDIR/tmp/test_file1.tmp; + +--error 1 +--exec echo "cat_file non_existing_file;" | $MYSQL_TEST 2>&1 + +# ---------------------------------------------------------------------------- # test for file_exist # ---------------------------------------------------------------------------- --error 1 |