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


sql/log.cc:
  Auto merged