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/std_data | |
| 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/std_data')
| -rw-r--r-- | mysql-test/std_data/loaddata5.dat | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/std_data/loaddata5.dat b/mysql-test/std_data/loaddata5.dat new file mode 100644 index 00000000000..5bdddfa977a --- /dev/null +++ b/mysql-test/std_data/loaddata5.dat @@ -0,0 +1,3 @@ +"field1","field2" +"a""b","cd""ef" +"a"b",c"d"e |