Skip to content

Commit c0024d2

Browse files
committed
Bug#35327006 Stabilize the weekly runs [noclose]
Modify innodb.innodb_mysql so that it runs with --hypergraph Change-Id: I0ecd194c4babf6bbe28de0ae4044a60719e7fa76
1 parent 5627210 commit c0024d2

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

mysql-test/suite/innodb/r/innodb_mysql.result

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2352,13 +2352,10 @@ INSERT INTO t4 VALUES (1),(2),(3),(4),(5);
23522352
INSERT INTO t5 VALUES (1);
23532353
DELETE t5 FROM t4 LEFT JOIN t5 ON t4.a= t5.a;
23542354
DELETE t2, t1 FROM t2 INNER JOIN t1 ON (t2.aid = t1.id) WHERE t2.id = 1;
2355-
ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`t3`, CONSTRAINT `t3_ibfk_1` FOREIGN KEY (`bid`) REFERENCES `t2` (`id`))
2355+
Got one of the listed errors
23562356
DELETE t2, t1 FROM t2 INNER JOIN t1 ON (t2.aid = t1.id) WHERE t2.id = 1;
2357-
ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`t3`, CONSTRAINT `t3_ibfk_1` FOREIGN KEY (`bid`) REFERENCES `t2` (`id`))
2357+
Got one of the listed errors
23582358
DELETE IGNORE t2, t1 FROM t2 INNER JOIN t1 ON (t2.aid = t1.id) WHERE t2.id = 1;
2359-
Warnings:
2360-
Warning 1451 Cannot delete or update a parent row: a foreign key constraint fails (`test`.`t3`, CONSTRAINT `t3_ibfk_1` FOREIGN KEY (`bid`) REFERENCES `t2` (`id`))
2361-
Warning 1451 Cannot delete or update a parent row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`aid`) REFERENCES `t1` (`id`))
23622359
DROP TABLE t3;
23632360
DROP TABLE t2;
23642361
DROP TABLE t1;

mysql-test/suite/innodb/t/innodb_mysql.test

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,11 +237,11 @@ INSERT INTO t5 VALUES (1);
237237

238238
DELETE t5 FROM t4 LEFT JOIN t5 ON t4.a= t5.a;
239239

240-
--error ER_ROW_IS_REFERENCED_2
240+
--error ER_ROW_IS_REFERENCED_2, ER_ROW_IS_REFERENCED_2
241241
DELETE t2, t1 FROM t2 INNER JOIN t1 ON (t2.aid = t1.id) WHERE t2.id = 1;
242-
--error ER_ROW_IS_REFERENCED_2
242+
--error ER_ROW_IS_REFERENCED_2, ER_ROW_IS_REFERENCED_2
243243
DELETE t2, t1 FROM t2 INNER JOIN t1 ON (t2.aid = t1.id) WHERE t2.id = 1;
244-
244+
--disable_warnings ER_ROW_IS_REFERENCED_2 ONCE
245245
DELETE IGNORE t2, t1 FROM t2 INNER JOIN t1 ON (t2.aid = t1.id) WHERE t2.id = 1;
246246

247247
DROP TABLE t3;

0 commit comments

Comments
 (0)