into  mysql.com:/usr/local/mysql/tmp5.1


sql/log_event.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged