BitKeeper/etc/logging_ok:
  auto-union
sql/handler.cc:
  Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
  Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
sql/sql_table.cc:
  Auto merged