diff options
| author | unknown <msvensson@pilot.(none)> | 2007-08-07 11:42:14 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-08-07 11:42:14 +0200 |
| commit | 6a0ffef9e0da2a154ffbfe9f062a58afd37c6da4 (patch) | |
| tree | 0bad5fb4b1dc6128c97876c40451ad1fe3ad9ccf /mysql-test/t/mysql.test | |
| parent | ef5d4d2cdb40d830707ac60dae574720655f7337 (diff) | |
| parent | eb95e90cf896693db0c1df8dc6301a766f77644c (diff) | |
| download | mariadb-git-6a0ffef9e0da2a154ffbfe9f062a58afd37c6da4.tar.gz | |
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/mysqladmin.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/sp-destruct.test:
Auto merged
client/mysqltest.c:
Manual merge
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 |