into  mysql.com:/home/alexi/dev/mysql-5.1-studio


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