sql/sql_parse.cc:
  Auto merged
sql/mysqld.cc:
  another bookkeeping commit during merge
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted