Skip to content

Commit b68dac8

Browse files
dr-mdr-m
committed
MDEV-15219 FOREIGN KEY CASCADE or SET NULL operations will not resume after lock wait
This corruption was introduced in MDEV-13331. It would have been caught by the MySQL 5.7 test innodb.update-cascade which MariaDB was missing until now. row_ins_check_foreign_constraint(): Never replace err == DB_LOCK_WAIT with other values than DB_LOCK_WAIT_TIMEOUT.
1 parent 1789e0f commit b68dac8

File tree

3 files changed

+517
-3
lines changed

3 files changed

+517
-3
lines changed

‎mysql-test/suite/innodb/r/update-cascade.result

Lines changed: 292 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,292 @@
1+
#
2+
# Bug #18451287 REDUNDANT DELETE MARKING AFTER DB_LOCK_WAIT
3+
#
4+
create table t1 (f1 int primary key, f2 blob) engine=innodb;
5+
create table t2 (f1 int primary key, f2 int,
6+
foreign key (f2) references t1(f1) on update cascade) engine=innodb;
7+
show create table t1;
8+
Table Create Table
9+
t1 CREATE TABLE `t1` (
10+
`f1` int(11) NOT NULL,
11+
`f2` blob DEFAULT NULL,
12+
PRIMARY KEY (`f1`)
13+
) ENGINE=InnoDB DEFAULT CHARSET=latin1
14+
show create table t2;
15+
Table Create Table
16+
t2 CREATE TABLE `t2` (
17+
`f1` int(11) NOT NULL,
18+
`f2` int(11) DEFAULT NULL,
19+
PRIMARY KEY (`f1`),
20+
KEY `f2` (`f2`),
21+
CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`f2`) REFERENCES `t1` (`f1`) ON UPDATE CASCADE
22+
) ENGINE=InnoDB DEFAULT CHARSET=latin1
23+
insert into t1 values (1, repeat('+', 20000));
24+
insert into t1 values (2, repeat('-', 20000));
25+
insert into t1 values (3, repeat('=', 20000));
26+
insert into t2 values (1, 2);
27+
select f1, right(f2, 20) as p2 from t1;
28+
f1 p2
29+
1 ++++++++++++++++++++
30+
2 --------------------
31+
3 ====================
32+
select f1, f2 from t2;
33+
f1 f2
34+
1 2
35+
connect con1,localhost,root,,test;
36+
start transaction;
37+
select f1, f2 from t2 for update;
38+
f1 f2
39+
1 2
40+
connection default;
41+
set debug_sync='lock_wait_suspend_thread_enter SIGNAL upd_waiting WAIT_FOR go_upd';
42+
update t1 set f1 = 10 where f1 = 2;
43+
connection con1;
44+
set debug_sync='now WAIT_FOR upd_waiting';
45+
rollback;
46+
set debug_sync='now SIGNAL go_upd';
47+
connection default;
48+
# reap: update t1 set f1 = 10 where f1 = 2;
49+
select f1, right(f2, 20) as p2 from t1;
50+
f1 p2
51+
1 ++++++++++++++++++++
52+
3 ====================
53+
10 --------------------
54+
select f1, f2 from t2;
55+
f1 f2
56+
1 10
57+
drop table t2, t1;
58+
set debug_sync = reset;
59+
#
60+
# Test Scenario: Two tables t1 -> t2 are involved in update cascade.
61+
# If DB_LOCK_WAIT happens when t1 is being updated and FK constraints
62+
# are being checked in t2, then retry must happen on t1. The update
63+
# cascade happens in secondary index. For secondary index testing,
64+
# blobs are not needed.
65+
#
66+
create table t1 (f1 int primary key, f2 int, key k1(f2)) engine=innodb;
67+
create table t2 (f1 int primary key, f2 int,
68+
foreign key (f2) references t1(f2) on update cascade) engine=innodb;
69+
show create table t1;
70+
Table Create Table
71+
t1 CREATE TABLE `t1` (
72+
`f1` int(11) NOT NULL,
73+
`f2` int(11) DEFAULT NULL,
74+
PRIMARY KEY (`f1`),
75+
KEY `k1` (`f2`)
76+
) ENGINE=InnoDB DEFAULT CHARSET=latin1
77+
show create table t2;
78+
Table Create Table
79+
t2 CREATE TABLE `t2` (
80+
`f1` int(11) NOT NULL,
81+
`f2` int(11) DEFAULT NULL,
82+
PRIMARY KEY (`f1`),
83+
KEY `f2` (`f2`),
84+
CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`f2`) REFERENCES `t1` (`f2`) ON UPDATE CASCADE
85+
) ENGINE=InnoDB DEFAULT CHARSET=latin1
86+
insert into t1 values (1, 91);
87+
insert into t2 values (1, 91);
88+
select f1, f2 from t1;
89+
f1 f2
90+
1 91
91+
select f1, f2 from t2;
92+
f1 f2
93+
1 91
94+
connection con1;
95+
start transaction;
96+
select f1, f2 from t2 for update;
97+
f1 f2
98+
1 91
99+
connection default;
100+
set debug_sync='lock_wait_suspend_thread_enter SIGNAL upd_waiting WAIT_FOR go_upd';
101+
update t1 set f2 = 28 where f2 = 91;
102+
connection con1;
103+
set debug_sync='now WAIT_FOR upd_waiting';
104+
rollback;
105+
set debug_sync='now SIGNAL go_upd';
106+
connection default;
107+
# reap: update t1 set f1 = 10 where f1 = 2;
108+
select f1, f2 from t1;
109+
f1 f2
110+
1 28
111+
select f1, f2 from t2;
112+
f1 f2
113+
1 28
114+
drop table t2, t1;
115+
set debug_sync = reset;
116+
#
117+
# Test Scenario: Three tables t1 -> t2 -> t3 are involved in update cascade.
118+
# If DB_LOCK_WAIT happens when t2 is being updated, then retry must happen
119+
# on t2.
120+
#
121+
create table t1 (f1 int primary key, f2 blob) engine=innodb;
122+
create table t2 (f1 int primary key, f2 blob,
123+
foreign key (f1) references t1(f1) on update cascade) engine=innodb;
124+
create table t3 (f1 int primary key, f2 blob,
125+
foreign key (f1) references t2(f1) on update cascade) engine=innodb;
126+
show create table t1;
127+
Table Create Table
128+
t1 CREATE TABLE `t1` (
129+
`f1` int(11) NOT NULL,
130+
`f2` blob DEFAULT NULL,
131+
PRIMARY KEY (`f1`)
132+
) ENGINE=InnoDB DEFAULT CHARSET=latin1
133+
show create table t2;
134+
Table Create Table
135+
t2 CREATE TABLE `t2` (
136+
`f1` int(11) NOT NULL,
137+
`f2` blob DEFAULT NULL,
138+
PRIMARY KEY (`f1`),
139+
CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`f1`) REFERENCES `t1` (`f1`) ON UPDATE CASCADE
140+
) ENGINE=InnoDB DEFAULT CHARSET=latin1
141+
show create table t3;
142+
Table Create Table
143+
t3 CREATE TABLE `t3` (
144+
`f1` int(11) NOT NULL,
145+
`f2` blob DEFAULT NULL,
146+
PRIMARY KEY (`f1`),
147+
CONSTRAINT `t3_ibfk_1` FOREIGN KEY (`f1`) REFERENCES `t2` (`f1`) ON UPDATE CASCADE
148+
) ENGINE=InnoDB DEFAULT CHARSET=latin1
149+
insert into t1 values (2, repeat('-', 20000));
150+
insert into t2 values (2, repeat('%', 20000));
151+
insert into t3 values (2, repeat('+', 20000));
152+
select f1, right(f2, 20) as p2 from t1;
153+
f1 p2
154+
2 --------------------
155+
select f1, right(f2, 20) as p2 from t2;
156+
f1 p2
157+
2 %%%%%%%%%%%%%%%%%%%%
158+
select f1, right(f2, 20) as p2 from t3;
159+
f1 p2
160+
2 ++++++++++++++++++++
161+
connection con1;
162+
start transaction;
163+
select f1 from t3 for update;
164+
f1
165+
2
166+
connection default;
167+
set debug_sync='lock_wait_suspend_thread_enter SIGNAL upd_waiting WAIT_FOR go_upd';
168+
update t1 set f1 = 10 where f1 = 2;
169+
connection con1;
170+
set debug_sync='now WAIT_FOR upd_waiting';
171+
rollback;
172+
# The table t1 is updated.
173+
# In t2 delete-mark happened. Retry will happen on t2.
174+
# In t3 yet to be updated.
175+
set session transaction isolation level read uncommitted;
176+
start transaction;
177+
select f1, right(f2, 20) as p2 from t1;
178+
f1 p2
179+
10 --------------------
180+
select f1, right(f2, 20) as p2 from t2;
181+
f1 p2
182+
select f1, right(f2, 20) as p2 from t3;
183+
f1 p2
184+
2 ++++++++++++++++++++
185+
commit;
186+
set debug_sync='now SIGNAL go_upd';
187+
connection default;
188+
# reap: update t1 set f1 = 10 where f1 = 2;
189+
start transaction;
190+
select f1, right(f2, 20) as p2 from t1;
191+
f1 p2
192+
10 --------------------
193+
select f1, right(f2, 20) as p2 from t2;
194+
f1 p2
195+
10 %%%%%%%%%%%%%%%%%%%%
196+
select f1, right(f2, 20) as p2 from t3;
197+
f1 p2
198+
10 ++++++++++++++++++++
199+
commit;
200+
drop table t3, t2, t1;
201+
set debug_sync = reset;
202+
#
203+
# Test Scenario: Three tables t1 -> t2 -> t3 are involved in update
204+
# cascade. If DB_LOCK_WAIT happens when t2 is being updated, then
205+
# retry must happen on t2. The update cascade is happening via
206+
# secondary index (hence blobs are not needed).
207+
#
208+
create table t1 (f1 int primary key, f2 int, key k1(f2)) engine=innodb;
209+
create table t2 (f1 int primary key, f2 int,
210+
foreign key (f2) references t1(f2) on update cascade) engine=innodb;
211+
create table t3 (f1 int primary key, f2 int,
212+
foreign key (f2) references t2(f2) on update cascade) engine=innodb;
213+
show create table t1;
214+
Table Create Table
215+
t1 CREATE TABLE `t1` (
216+
`f1` int(11) NOT NULL,
217+
`f2` int(11) DEFAULT NULL,
218+
PRIMARY KEY (`f1`),
219+
KEY `k1` (`f2`)
220+
) ENGINE=InnoDB DEFAULT CHARSET=latin1
221+
show create table t2;
222+
Table Create Table
223+
t2 CREATE TABLE `t2` (
224+
`f1` int(11) NOT NULL,
225+
`f2` int(11) DEFAULT NULL,
226+
PRIMARY KEY (`f1`),
227+
KEY `f2` (`f2`),
228+
CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`f2`) REFERENCES `t1` (`f2`) ON UPDATE CASCADE
229+
) ENGINE=InnoDB DEFAULT CHARSET=latin1
230+
show create table t3;
231+
Table Create Table
232+
t3 CREATE TABLE `t3` (
233+
`f1` int(11) NOT NULL,
234+
`f2` int(11) DEFAULT NULL,
235+
PRIMARY KEY (`f1`),
236+
KEY `f2` (`f2`),
237+
CONSTRAINT `t3_ibfk_1` FOREIGN KEY (`f2`) REFERENCES `t2` (`f2`) ON UPDATE CASCADE
238+
) ENGINE=InnoDB DEFAULT CHARSET=latin1
239+
insert into t1 values (2, 91);
240+
insert into t2 values (2, 91);
241+
insert into t3 values (2, 91);
242+
select f1, f2 from t1;
243+
f1 f2
244+
2 91
245+
select f1, f2 from t2;
246+
f1 f2
247+
2 91
248+
select f1, f2 from t3;
249+
f1 f2
250+
2 91
251+
connection con1;
252+
start transaction;
253+
select f1 from t3 for update;
254+
f1
255+
2
256+
connection default;
257+
set debug_sync='lock_wait_suspend_thread_enter SIGNAL upd_waiting WAIT_FOR go_upd';
258+
update t1 set f2 = 28 where f2 = 91;
259+
connection con1;
260+
set debug_sync='now WAIT_FOR upd_waiting';
261+
rollback;
262+
# The table t1 is updated.
263+
# In t2 delete-mark happened. Retry will happen on t2.
264+
# In t3 yet to be updated.
265+
set session transaction isolation level read uncommitted;
266+
start transaction;
267+
select f1, f2 from t1;
268+
f1 f2
269+
2 28
270+
select f1, f2 from t2;
271+
f1 f2
272+
select f1, f2 from t3;
273+
f1 f2
274+
2 91
275+
commit;
276+
set debug_sync='now SIGNAL go_upd';
277+
disconnect con1;
278+
connection default;
279+
# reap: update t1 set f2 = 28 where f2 = 91;
280+
start transaction;
281+
select f1, f2 from t1;
282+
f1 f2
283+
2 28
284+
select f1, f2 from t2;
285+
f1 f2
286+
2 28
287+
select f1, f2 from t3;
288+
f1 f2
289+
2 28
290+
commit;
291+
drop table t3, t2, t1;
292+
set debug_sync = reset;

0 commit comments

Comments
 (0)