diff options
author | msvensson@pilot.(none) <> | 2007-08-07 11:42:14 +0200 |
---|---|---|
committer | msvensson@pilot.(none) <> | 2007-08-07 11:42:14 +0200 |
commit | 66b74f6a3363c668689d8cec4c8fc943c791e048 (patch) | |
tree | 0bad5fb4b1dc6128c97876c40451ad1fe3ad9ccf /mysql-test/t/mysql.test | |
parent | 35503e7678568fa13e016a90f84c4435c81c7417 (diff) | |
parent | f785bf00de77ba5c562a511b6bcd773eb95f7a85 (diff) | |
download | mariadb-git-66b74f6a3363c668689d8cec4c8fc943c791e048.tar.gz |
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
Diffstat (limited to 'mysql-test/t/mysql.test')
-rw-r--r-- | mysql-test/t/mysql.test | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index 16f5fecf051..ac713d49b92 100644 --- a/mysql-test/t/mysql.test +++ b/mysql-test/t/mysql.test @@ -242,18 +242,21 @@ DELIMITER / SELECT 1/ EOF --exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug21412.sql 2>&1 +remove_file $MYSQLTEST_VARDIR/tmp/bug21412.sql; # This should give an error... --write_file $MYSQLTEST_VARDIR/tmp/bug21412.sql DELIMITER \ EOF --exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug21412.sql 2>&1 +remove_file $MYSQLTEST_VARDIR/tmp/bug21412.sql; # As should this... --write_file $MYSQLTEST_VARDIR/tmp/bug21412.sql DELIMITER \\ EOF --exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug21412.sql 2>&1 +remove_file $MYSQLTEST_VARDIR/tmp/bug21412.sql; # # Some coverage of not normally used parts |