mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
This commit is contained in:
@ -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
|
||||
|
||||
#
|
||||
|
Reference in New Issue
Block a user