database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

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

Browse Source 
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
This commit is contained in:
unknown
2005-10-21 17:57:51 -07:00
parent 07fa475e26 c686f699b2
commit 2750dc8766
4 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/std_data/loaddata5.dat Normal file
View File

@ -0,0 +1,3 @@
"field1","field2"
"a""b","cd""ef"
"a"b",c"d"e