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
This commit is contained in:
unknown 2006-06-29 17:35:59 +02:00
commit 801b1afe4d

Diff content is not available