into  bodhi.(none):/opt/local/work/mysql-5.1-12713-new


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