1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0-bt

into  quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-bt-merged


mysql-test/t/loaddata.test:
  Auto merged
mysql-test/r/loaddata.result:
  Manually merged.
sql/share/errmsg.txt:
  Manually merged.
sql/sql_load.cc:
  Manually merged.
This commit is contained in:
unknown
2008-03-28 23:54:14 +03:00
5 changed files with 206 additions and 14 deletions

View File

@ -0,0 +1,3 @@
"1", "string1"
"2", "string2"
"3", "string3"