BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
myisam/mi_key.c:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/r/innodb.result:
  Manual merge
sql/sql_parse.cc:
  Manual merge