mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-19 23:05:32 +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

3
mysql-test/std_data/loaddata_dq.dat Normal file
View file

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