diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-10-25 20:00:51 +0400 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-10-25 20:00:51 +0400 |
| commit | e171a36efbea489590e4795803ab2f9ef86c415c (patch) | |
| tree | a77b1da0175533da33a64424702c5d13e6731bb3 /mysql-test/r/innodb_mysql.result | |
| parent | d4553e35586398a89b005bff0d55280ce237483e (diff) | |
| parent | e3d49f0c3f7995e2c618cfa764a1ceaa2418a669 (diff) | |
| download | mariadb-git-e171a36efbea489590e4795803ab2f9ef86c415c.tar.gz | |
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug18819
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.
Diffstat (limited to 'mysql-test/r/innodb_mysql.result')
| -rw-r--r-- | mysql-test/r/innodb_mysql.result | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result index b4101e037f2..cc0fc4289dc 100644 --- a/mysql-test/r/innodb_mysql.result +++ b/mysql-test/r/innodb_mysql.result @@ -295,6 +295,23 @@ 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 ( +i INT NOT NULL, +FOREIGN KEY (i) REFERENCES t1 (i) ON DELETE NO ACTION +) ENGINE= InnoDB; +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 +SELECT * FROM t1, t2; +i i +1 1 +DROP TABLE t2, t1; +End of 4.1 tests. create table t1 ( a varchar(30), b varchar(30), primary key(a), key(b) ) engine=innodb; |