diff options
| author | Tatiana A. Nurnberg <azundris@mysql.com> | 2008-09-18 11:32:54 +0200 |
|---|---|---|
| committer | Tatiana A. Nurnberg <azundris@mysql.com> | 2008-09-18 11:32:54 +0200 |
| commit | 7a40f2610e889c08f1f12f6d15d6435b440b1389 (patch) | |
| tree | 242924593b6234a04214eb43ca7163c8bce41bbd /mysql-test/t/loaddata.test | |
| parent | c8324002e2e110fb48a383d8d992043f16465d96 (diff) | |
| parent | 654db75dfbedf64435fb7fdb00500396e0ee92f1 (diff) | |
| download | mariadb-git-7a40f2610e889c08f1f12f6d15d6435b440b1389.tar.gz | |
manual merge
Diffstat (limited to 'mysql-test/t/loaddata.test')
| -rw-r--r-- | mysql-test/t/loaddata.test | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/mysql-test/t/loaddata.test b/mysql-test/t/loaddata.test index 9f93bb32d5f..46de411677c 100644 --- a/mysql-test/t/loaddata.test +++ b/mysql-test/t/loaddata.test @@ -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 |