diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-10-25 20:09:31 +0400 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-10-25 20:09:31 +0400 |
| commit | 6137ef86a98745cc818ed1de0580e628efc0d3ec (patch) | |
| tree | 2d9b93d69928a3d9cea4a03ffea0322879f6fac0 /mysql-test/r/innodb_mysql.result | |
| parent | e171a36efbea489590e4795803ab2f9ef86c415c (diff) | |
| download | mariadb-git-6137ef86a98745cc818ed1de0580e628efc0d3ec.tar.gz | |
Fix after manual merge.
Diffstat (limited to 'mysql-test/r/innodb_mysql.result')
| -rw-r--r-- | mysql-test/r/innodb_mysql.result | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result index cc0fc4289dc..a96bc4786fa 100644 --- a/mysql-test/r/innodb_mysql.result +++ b/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 |