-
unknown authored
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug18819 mysql-test/r/innodb_mysql.result: Manual merge. mysql-test/t/innodb_mysql.test: Manual merge. sql/sql_delete.cc: Manual merge.
e171a36e
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug18819 mysql-test/r/innodb_mysql.result: Manual merge. mysql-test/t/innodb_mysql.test: Manual merge. sql/sql_delete.cc: Manual merge.