Fix after manual merge.

mysql-test/r/innodb_mysql.result

@@ -295,7 +295,6 @@ b
 c
 d
 drop table t1,t4;
-
 DROP TABLE IF EXISTS t2, t1;
 CREATE TABLE t1 (i INT NOT NULL PRIMARY KEY) ENGINE= InnoDB;
 CREATE TABLE t2 (
@@ -306,7 +305,7 @@ INSERT INTO t1 VALUES (1);
 INSERT INTO t2 VALUES (1);
 DELETE IGNORE FROM t1 WHERE i = 1;
 Warnings:
-Error	1217	Cannot delete or update a parent row: a foreign key constraint fails
+Error	1451	Cannot delete or update a parent row: a foreign key constraint fails (`test/t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`i`) REFERENCES `t1` (`i`) ON DELETE NO ACTION)
 SELECT * FROM t1, t2;
 i	i
 1	1