summaryrefslogtreecommitdiff
path: root/mysql-test/r/loaddata.result
diff options
context:
space:
mode:
authorTatiana A. Nurnberg <azundris@mysql.com>2008-09-18 11:32:54 +0200
committerTatiana A. Nurnberg <azundris@mysql.com>2008-09-18 11:32:54 +0200
commit7a40f2610e889c08f1f12f6d15d6435b440b1389 (patch)
tree242924593b6234a04214eb43ca7163c8bce41bbd /mysql-test/r/loaddata.result
parentc8324002e2e110fb48a383d8d992043f16465d96 (diff)
parent654db75dfbedf64435fb7fdb00500396e0ee92f1 (diff)
downloadmariadb-git-7a40f2610e889c08f1f12f6d15d6435b440b1389.tar.gz
manual merge
Diffstat (limited to 'mysql-test/r/loaddata.result')
-rw-r--r--mysql-test/r/loaddata.result4
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result
index a25d9561aba..4e458e831cf 100644
--- a/mysql-test/r/loaddata.result
+++ b/mysql-test/r/loaddata.result
@@ -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