Docs/manual.texi:
  Auto merged
BitKeeper/etc/logging_ok:
  Auto merged
mysys/my_init.c:
  Auto merged
sql/sql_table.cc:
  Auto merged