BitKeeper/etc/logging_ok:
  auto-union
include/mysql_com.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/ha_innodb.cc:
  Keep local copy