Commit 5e643e31 authored by unknown's avatar unknown

Merge trift2.:/M50/tmp_merge2

into  trift2.:/M51/merge-5.1


include/my_sys.h:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/log.cc:
  Auto merged
parents 0293b84a 801b1afe
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment