Commit f132d192 authored by unknown's avatar unknown
Browse files

After merge fix.

parent f62faee9

mysql-test/r/innodb_mysql.result

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ INSERT INTO t1 VALUES (1); 
INSERT INTO t2 VALUES (1);

DELETE IGNORE FROM t1 WHERE i = 1;

Warnings:

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)

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