diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-02-20 13:06:25 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-02-20 13:06:25 +0100 |
| commit | fb4ed0702d39b277113672d8da8a2353a5305bfd (patch) | |
| tree | d41b7c4be6b6e595419ec5270af7a3c3608dd873 /mysql-test/t/mysql.test | |
| parent | 71a25f2b3e07abd83affc63c485fb69366fa369a (diff) | |
| parent | e78413ca2b2eee3e3aaf982711c75e644f14a573 (diff) | |
| download | mariadb-git-fb4ed0702d39b277113672d8da8a2353a5305bfd.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
mysql-test/t/mysql.test:
Auto merged
mysys/mf_iocache.c:
Auto merged
Diffstat (limited to 'mysql-test/t/mysql.test')
| -rw-r--r-- | mysql-test/t/mysql.test | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index 2a6eb46627c..4e8a46bd2e2 100644 --- a/mysql-test/t/mysql.test +++ b/mysql-test/t/mysql.test @@ -251,16 +251,22 @@ drop table t17583; # # This should work just fine... ---exec echo "DELIMITER /" > $MYSQLTEST_VARDIR/tmp/bug21412.sql ---exec echo "SELECT 1/" >> $MYSQLTEST_VARDIR/tmp/bug21412.sql +--write_file $MYSQLTEST_VARDIR/tmp/bug21412.sql +DELIMITER / +SELECT 1/ +EOF --exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug21412.sql 2>&1 # This should give an error... ---exec echo "DELIMITER \\" > $MYSQLTEST_VARDIR/tmp/bug21412.sql +--write_file $MYSQLTEST_VARDIR/tmp/bug21412.sql +DELIMITER \ +EOF --exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug21412.sql 2>&1 # As should this... ---exec echo "DELIMITER \\\\" > $MYSQLTEST_VARDIR/tmp/bug21412.sql +--write_file $MYSQLTEST_VARDIR/tmp/bug21412.sql +DELIMITER \\ +EOF --exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug21412.sql 2>&1 # |