database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

manual merge

Browse Source
This commit is contained in:
Tatiana A. Nurnberg
2008-09-18 11:32:54 +02:00
parent c8324002e2 654db75dfb
commit 7a40f2610e
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/loaddata.result
View File

@ -343,9 +343,11 @@ SET SESSION character_set_server=latin1;
SET SESSION character_set_connection=latin1; SET SESSION character_set_connection=latin1;
SET @OLD_SQL_MODE=@@SESSION.SQL_MODE; SET @OLD_SQL_MODE=@@SESSION.SQL_MODE;
test LOAD DATA INFILE test LOAD DATA INFILE
SET sql_mode = '';
SELECT '1 \\aa\n' INTO DUMPFILE 'MYSQLTEST_VARDIR/tmp/bug37114.txt';
CREATE TABLE t1 (id INT, val1 CHAR(3)) ENGINE=MyISAM; CREATE TABLE t1 (id INT, val1 CHAR(3)) ENGINE=MyISAM;
SET sql_mode = 'NO_BACKSLASH_ESCAPES'; SET sql_mode = 'NO_BACKSLASH_ESCAPES';
LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/bug37114.txt' REPLACE INTO TABLE t1 FIELDS TERMINATED BY ' '; LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug37114.txt' REPLACE INTO TABLE t1 FIELDS TERMINATED BY ' ';
SELECT * FROM t1; SELECT * FROM t1;
id val1 id val1
1 \aa 1 \aa

12
mysql-test/t/loaddata.test
View File

@ -320,9 +320,10 @@ DROP VIEW v3;
--echo --echo
--echo # -- End of Bug#35469. --echo # -- End of Bug#35469.
###########################################################################
###########################################################################
# #
# Bug#37114: sql_mode NO_BACKSLASH_ESCAPES does not work properly with # Bug#37114: sql_mode NO_BACKSLASH_ESCAPES does not work properly with
# LOAD DATA INFILE # LOAD DATA INFILE
@ -361,16 +362,17 @@ SET @OLD_SQL_MODE=@@SESSION.SQL_MODE;
--let $file=$MYSQLTEST_VARDIR/tmp/bug37114.txt --let $file=$MYSQLTEST_VARDIR/tmp/bug37114.txt
--let $file2=$MYSQLTEST_VARDIR/tmp/bug37114_out.txt --let $file2=$MYSQLTEST_VARDIR/tmp/bug37114_out.txt
--write_file $file SET sql_mode = '';
1 \aa
EOF --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
--eval SELECT '1 \\\\aa\n' INTO DUMPFILE '$file'
CREATE TABLE t1 (id INT, val1 CHAR(3)) ENGINE=MyISAM; CREATE TABLE t1 (id INT, val1 CHAR(3)) ENGINE=MyISAM;
SET sql_mode = 'NO_BACKSLASH_ESCAPES'; SET sql_mode = 'NO_BACKSLASH_ESCAPES';
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --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; SELECT * FROM t1;
# show we can write this with OUTFILE, forcing the parameters for now # show we can write this with OUTFILE, forcing the parameters for now