summaryrefslogtreecommitdiff
path: root/mysql-test/t/mysql.test
diff options
context:
space:
mode:
authormsvensson@pilot.blaudden <>2007-02-20 13:06:01 +0100
committermsvensson@pilot.blaudden <>2007-02-20 13:06:01 +0100
commita799f2b6379d4772a8189e9fb19a564d56ebc3f2 (patch)
tree5253c8c2552ca955b1770ac79e305bd088714066 /mysql-test/t/mysql.test
parent0b5c41acc70395e03798dcf715967244d10407c3 (diff)
downloadmariadb-git-a799f2b6379d4772a8189e9fb19a564d56ebc3f2.tar.gz
Change "exec echo" commands with different delimiters that are also
escape chars to use "write_file" to avoid confusion about what's what.
Diffstat (limited to 'mysql-test/t/mysql.test')
-rw-r--r--mysql-test/t/mysql.test14
1 files 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