mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
810fc001d9
of untouched rows in full table scans". SELECT ... FOR UPDATE/LOCK IN SHARE MODE statements as well as UPDATE/DELETE statements which were executed using full table scan were not releasing locks on rows which didn't satisfy WHERE condition. This bug surfaced in 5.0 and affected NDB tables. (InnoDB tables intentionally don't support such unlocking in default mode). This problem occured because code implementing join didn't call handler::unlock_row() for rows which didn't satisfy part of condition attached to this particular table/level of nested loop. So we solve the problem adding this call. Note that we already had this call in place in 4.1 but it was lost (actually not quite correctly placed) when we have introduced nested joins. Also note that additional QA should be requested once this patch is pushed as interaction between handler::unlock_row() and many recent MySQL features such as subqueries, unions, views is not tested enough. mysql-test/r/ndb_lock.result: Enabled back part of the test that covers bug #20390 "SELECT FOR UPDATE does not release locks of untouched rows in full table scans". Adjusted test in such way that it now covers both execution paths in which we unlock non-matching rows inspected during table scan. mysql-test/t/ndb_lock.test: Enabled back part of the test that covers bug #20390 "SELECT FOR UPDATE does not release locks of untouched rows in full table scans". Adjusted test in such way that it now covers both execution paths in which we unlock non-matching rows inspected during table scan. sql/sql_select.cc: evaluate_join_record() should call handler::unlock_row() for records which don't satisfy condition which was pushed-down to this table/level of nested loop. We just put back the thing that we already have in 4.1 and which was lost when we have introduced nested joins.
189 lines
3.9 KiB
Text
189 lines
3.9 KiB
Text
DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
|
|
create table t1 (x integer not null primary key, y varchar(32)) engine = ndb;
|
|
insert into t1 values (1,'one'), (2,'two');
|
|
select * from t1 order by x;
|
|
x y
|
|
1 one
|
|
2 two
|
|
select * from t1 order by x;
|
|
x y
|
|
1 one
|
|
2 two
|
|
start transaction;
|
|
insert into t1 values (3,'three');
|
|
select * from t1 order by x;
|
|
x y
|
|
1 one
|
|
2 two
|
|
3 three
|
|
start transaction;
|
|
select * from t1 order by x;
|
|
x y
|
|
1 one
|
|
2 two
|
|
commit;
|
|
select * from t1 order by x;
|
|
x y
|
|
1 one
|
|
2 two
|
|
3 three
|
|
commit;
|
|
drop table t1;
|
|
create table t1 (pk integer not null primary key, u int not null, o int not null,
|
|
unique(u), key(o)) engine = ndb;
|
|
insert into t1 values (1,1,1), (2,2,2), (3,3,3), (4,4,4), (5,5,5);
|
|
lock tables t1 write;
|
|
delete from t1 where pk = 1;
|
|
unlock tables;
|
|
select * from t1 order by pk;
|
|
pk u o
|
|
2 2 2
|
|
3 3 3
|
|
4 4 4
|
|
5 5 5
|
|
insert into t1 values (1,1,1);
|
|
lock tables t1 write;
|
|
delete from t1 where u = 1;
|
|
unlock tables;
|
|
select * from t1 order by pk;
|
|
pk u o
|
|
2 2 2
|
|
3 3 3
|
|
4 4 4
|
|
5 5 5
|
|
insert into t1 values (1,1,1);
|
|
lock tables t1 write;
|
|
delete from t1 where o = 1;
|
|
unlock tables;
|
|
select * from t1 order by pk;
|
|
pk u o
|
|
2 2 2
|
|
3 3 3
|
|
4 4 4
|
|
5 5 5
|
|
insert into t1 values (1,1,1);
|
|
drop table t1;
|
|
create table t1 (x integer not null primary key, y varchar(32), z integer, key(z)) engine = ndb;
|
|
insert into t1 values (1,'one',1);
|
|
begin;
|
|
select * from t1 where x = 1 for update;
|
|
x y z
|
|
1 one 1
|
|
begin;
|
|
select * from t1 where x = 1 for update;
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
rollback;
|
|
rollback;
|
|
insert into t1 values (2,'two',2),(3,"three",3);
|
|
begin;
|
|
select * from t1 where x = 1 for update;
|
|
x y z
|
|
1 one 1
|
|
select * from t1 where x = 1 for update;
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
select * from t1 where x = 2 for update;
|
|
x y z
|
|
2 two 2
|
|
rollback;
|
|
commit;
|
|
begin;
|
|
select * from t1 where y = 'one' or y = 'three' for update;
|
|
x y z
|
|
# # #
|
|
# # #
|
|
begin;
|
|
select * from t1 where x = 2 for update;
|
|
x y z
|
|
2 two 2
|
|
select * from t1 where x = 1 for update;
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
rollback;
|
|
commit;
|
|
begin;
|
|
select * from t1 where y = 'one' or y = 'three' order by x for update;
|
|
x y z
|
|
1 one 1
|
|
3 three 3
|
|
begin;
|
|
select * from t1 where x = 2 for update;
|
|
x y z
|
|
2 two 2
|
|
select * from t1 where x = 1 for update;
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
rollback;
|
|
commit;
|
|
begin;
|
|
select * from t1 where z > 1 and z < 3 for update;
|
|
x y z
|
|
2 two 2
|
|
begin;
|
|
select * from t1 where x = 1 for update;
|
|
x y z
|
|
1 one 1
|
|
select * from t1 where x = 2 for update;
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
rollback;
|
|
commit;
|
|
begin;
|
|
select * from t1 where x = 1 lock in share mode;
|
|
x y z
|
|
1 one 1
|
|
begin;
|
|
select * from t1 where x = 1 lock in share mode;
|
|
x y z
|
|
1 one 1
|
|
select * from t1 where x = 2 for update;
|
|
x y z
|
|
2 two 2
|
|
select * from t1 where x = 1 for update;
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
rollback;
|
|
commit;
|
|
begin;
|
|
select * from t1 where y = 'one' or y = 'three' lock in share mode;
|
|
x y z
|
|
# # #
|
|
# # #
|
|
begin;
|
|
select * from t1 where y = 'one' lock in share mode;
|
|
x y z
|
|
1 one 1
|
|
select * from t1 where x = 2 for update;
|
|
x y z
|
|
2 two 2
|
|
select * from t1 where x = 1 for update;
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
rollback;
|
|
commit;
|
|
begin;
|
|
select * from t1 where y = 'one' or y = 'three' order by x lock in share mode;
|
|
x y z
|
|
1 one 1
|
|
3 three 3
|
|
begin;
|
|
select * from t1 where y = 'one' lock in share mode;
|
|
x y z
|
|
1 one 1
|
|
select * from t1 where x = 2 for update;
|
|
x y z
|
|
2 two 2
|
|
select * from t1 where x = 1 for update;
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
rollback;
|
|
commit;
|
|
begin;
|
|
select * from t1 where z > 1 and z < 3 lock in share mode;
|
|
x y z
|
|
2 two 2
|
|
begin;
|
|
select * from t1 where z = 1 lock in share mode;
|
|
x y z
|
|
1 one 1
|
|
select * from t1 where x = 1 for update;
|
|
x y z
|
|
1 one 1
|
|
select * from t1 where x = 2 for update;
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
rollback;
|
|
commit;
|
|
drop table t1;
|