diff options
| author | unknown <jimw@mysql.com> | 2005-10-26 14:11:08 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-10-26 14:11:08 -0700 |
| commit | 93f790248d07886666cff32d327fef116c519e86 (patch) | |
| tree | fefa272de0f1166e382e2d25bf1cebb7265a19d6 /mysql-test/t/loaddata.test | |
| parent | 49a492075a0d3d9b8628639e697b7d0105f56b28 (diff) | |
| parent | 1c9783e854965376844a021ab1312b373852f287 (diff) | |
| download | mariadb-git-93f790248d07886666cff32d327fef116c519e86.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/std_data/loaddata_dq.dat:
Merge rename: mysql-test/std_data/loaddata5.dat -> mysql-test/std_data/loaddata_dq.dat
sql/item.cc:
Auto merged
sql/sql_load.cc:
Auto merged
mysql-test/r/loaddata.result:
Resolve conflicts, deal with renamed dat file
mysql-test/t/loaddata.test:
Resolve conflicts, deal with renamed dat file
Diffstat (limited to 'mysql-test/t/loaddata.test')
| -rw-r--r-- | mysql-test/t/loaddata.test | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/mysql-test/t/loaddata.test b/mysql-test/t/loaddata.test index cd3a8f0fd92..09d97a42714 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 # @@ -59,6 +58,15 @@ select * from t1; SET @@SQL_MODE=@OLD_SQL_MODE; drop table t1; +# +# 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/loaddata_dq.dat' into table t1 fields terminated by ',' enclosed by '"' escaped by '"' (a,b); +select * from t1; +drop table t1; + # End of 4.1 tests # @@ -104,3 +112,5 @@ select * from t1; # cleanup drop table t1, t2; + +# End of 5.0 tests |