summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
authorjimw@mysql.com <>2005-10-26 14:11:08 -0700
committerjimw@mysql.com <>2005-10-26 14:11:08 -0700
commit607c12973732d27fb1b9a4543ed126ae7b3b5c5f (patch)
treefefa272de0f1166e382e2d25bf1cebb7265a19d6 /mysql-test/t
parent0eacb6fb35bb5e2c341a2fa1d060eceaa64c05a7 (diff)
parent7510c45423af35a11a6c8942501e4a0a8d0c3da7 (diff)
downloadmariadb-git-607c12973732d27fb1b9a4543ed126ae7b3b5c5f.tar.gz
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/loaddata.test12
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