into  weblab.(none):/home/marcsql/TREE/mysql-5.1-30712


sql/log.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged