Commit 46615086 authored by Tatiana A. Nurnberg's avatar Tatiana A. Nurnberg
Browse files

manual merge

parents 7d19a76a 86775b10

mysql-test/r/loaddata.result

+3 −1
Original line number Diff line number Diff line
@@ -343,9 +343,11 @@ SET SESSION character_set_server=latin1; 
SET SESSION character_set_connection=latin1;

SET @OLD_SQL_MODE=@@SESSION.SQL_MODE;

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;

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;

id	val1

1	\aa

mysql-test/t/loaddata.test

+7 −5
Original line number Diff line number Diff line
@@ -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