mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge mysql.com:/home/jimw/my/mysql-4.1-clean

Browse source 
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
This commit is contained in:
unknown 2005-10-26 14:11:08 -07:00
commit 93f790248d
5 changed files with 40 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
mysql-test/t/loaddata.test
View file

@ -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