sql/ha_ndbcluster.cc:
  Auto merged
mysql-test/r/ndb_autodiscover.result:
  Merge
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted