into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug18819


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