Commit 801b1afe authored by unknown's avatar unknown
Browse files

Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/merge-5.0 


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 6878aa96 d326551b

There are no changes