into  moonbone.local:/mnt/gentoo64/work/29310-bug-5.1-opt-mysql


mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
sql/sql_insert.cc:
  Auto merged