From e78413ca2b2eee3e3aaf982711c75e644f14a573 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 20 Feb 2007 13:06:01 +0100 Subject: [PATCH] Change "exec echo" commands with different delimiters that are also escape chars to use "write_file" to avoid confusion about what's what. --- mysql-test/t/mysql.test | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index 4270d8dec80..b46e4d5e595 100644 --- a/mysql-test/t/mysql.test +++ b/mysql-test/t/mysql.test @@ -250,16 +250,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 --echo End of 5.0 tests