diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-10-31 13:36:03 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-10-31 13:36:03 +0100 |
| commit | a99f47e2827994297dacd69834630fcd0ee2549b (patch) | |
| tree | 4e53f0757cbf373dc16fb6d0579d649440c39400 /mysql-test/t/mysqltest.test | |
| parent | d8fa981918d0a98fb83db4733542a61312fbff6c (diff) | |
| parent | 91faec36f9e2591e09a602d6064e9a67dae69ded (diff) | |
| download | mariadb-git-a99f47e2827994297dacd69834630fcd0ee2549b.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930
client/mysqltest.c:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
Diffstat (limited to 'mysql-test/t/mysqltest.test')
| -rw-r--r-- | mysql-test/t/mysqltest.test | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index 3d9dff4d373..26e25af2a8d 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -365,6 +365,15 @@ select 3 from t1 ; --exec $MYSQL_TEST < var/tmp/mysqltest.sql 2>&1 # +# Missing delimiter until eof +# The comment will be "sucked into" the sleep command since +# delimiter is missing +--system echo "sleep 7" > var/log/mysqltest.sql +--system echo "# Another comment" >> var/log/mysqltest.sql +--error 1 +--exec $MYSQL_TEST < var/log/mysqltest.sql 2>&1 + +# # Extra delimiter # --error 1 |