diff options
| author | unknown <jimw@mysql.com> | 2005-10-21 17:57:51 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-10-21 17:57:51 -0700 |
| commit | 2750dc8766017ddc6cbb13d25198df4477eb2a14 (patch) | |
| tree | cea4796a7b3ab7f6b02ae382afb690e76669aa80 /mysql-test/t/loaddata.test | |
| parent | 07fa475e26e47cc32e4225d1684e877ed19236b3 (diff) | |
| parent | c686f699b22c8ff7f3f9f2a6f550cdcb23db4793 (diff) | |
| download | mariadb-git-2750dc8766017ddc6cbb13d25198df4477eb2a14.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-11203
into mysql.com:/home/jimw/my/mysql-4.1-clean
sql/sql_load.cc:
Auto merged
mysql-test/r/loaddata.result:
Resolve conflict
mysql-test/t/loaddata.test:
Resolve conflict
Diffstat (limited to 'mysql-test/t/loaddata.test')
| -rw-r--r-- | mysql-test/t/loaddata.test | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mysql-test/t/loaddata.test b/mysql-test/t/loaddata.test index 86fbdc62702..340801e6a01 100644 --- a/mysql-test/t/loaddata.test +++ b/mysql-test/t/loaddata.test @@ -31,7 +31,6 @@ load data infile '../../std_data/loaddata4.dat' into table t1 fields terminated select * from t1; drop table t1; - # # Bug #12053 LOAD DATA INFILE ignores NO_AUTO_VALUE_ON_ZERO setting # @@ -58,4 +57,13 @@ select * from t1; --exec rm $MYSQL_TEST_DIR/var/tmp/t1 SET @@SQL_MODE=@OLD_SQL_MODE; +# +# Bug #11203: LOAD DATA does not accept same characters for ESCAPED and +# ENCLOSED +# +create table t1 (a varchar(20), b varchar(20)); +load data infile '../../std_data/loaddata5.dat' into table t1 fields terminated by ',' enclosed by '"' escaped by '"' (a,b); +select * from t1; +drop table t1; + # End of 4.1 tests |