mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
manual merge
This commit is contained in:
@ -320,9 +320,10 @@ DROP VIEW v3;
|
||||
--echo
|
||||
--echo # -- End of Bug#35469.
|
||||
|
||||
###########################################################################
|
||||
|
||||
|
||||
###########################################################################
|
||||
|
||||
#
|
||||
# Bug#37114: sql_mode NO_BACKSLASH_ESCAPES does not work properly with
|
||||
# LOAD DATA INFILE
|
||||
@ -361,16 +362,17 @@ SET @OLD_SQL_MODE=@@SESSION.SQL_MODE;
|
||||
--let $file=$MYSQLTEST_VARDIR/tmp/bug37114.txt
|
||||
--let $file2=$MYSQLTEST_VARDIR/tmp/bug37114_out.txt
|
||||
|
||||
--write_file $file
|
||||
1 \aa
|
||||
EOF
|
||||
SET sql_mode = '';
|
||||
|
||||
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||||
--eval SELECT '1 \\\\aa\n' INTO DUMPFILE '$file'
|
||||
|
||||
CREATE TABLE t1 (id INT, val1 CHAR(3)) ENGINE=MyISAM;
|
||||
|
||||
SET sql_mode = 'NO_BACKSLASH_ESCAPES';
|
||||
|
||||
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
|
||||
--eval LOAD DATA LOCAL INFILE '$file' REPLACE INTO TABLE t1 FIELDS TERMINATED BY ' '
|
||||
--eval LOAD DATA INFILE '$file' REPLACE INTO TABLE t1 FIELDS TERMINATED BY ' '
|
||||
SELECT * FROM t1;
|
||||
|
||||
# show we can write this with OUTFILE, forcing the parameters for now
|
||||
|
Reference in New Issue
Block a user