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/r/loaddata.result | |
| 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/r/loaddata.result')
| -rw-r--r-- | mysql-test/r/loaddata.result | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result index f9d47e3533c..4e47ce6f82c 100644 --- a/mysql-test/r/loaddata.result +++ b/mysql-test/r/loaddata.result @@ -77,6 +77,14 @@ id 0 SET @@SQL_MODE=@OLD_SQL_MODE; drop table t1; +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; +a b +field1 field2 +a"b cd"ef +a"b c"d"e +drop table t1; create table t1 (a int default 100, b int, c varchar(60)); load data infile '../../std_data/rpl_loaddata.dat' into table t1 (a, @b) set b=@b+10, c=concat("b=",@b); select * from t1; |