unknown 45ffe7183d 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.

2008-03-28 23:54:14 +03:00

10 KiB

Raw Blame History

View Raw