BitKeeper/etc/logging_ok:
  auto-union
client/mysqltest.c:
  Auto merged
sql-common/client.c:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/sql_client.cc:
  Auto merged
include/mysql.h:
  Merging (prolly it's the mistake)
libmysqld/libmysqld.c:
  This code seems to be unnecessary