database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

MDEV-29433 innodb.lock_delete_updated is unstable

Browse Source 
Use suspend thread syncpoint instead of include/wait_condition.inc to
make sure DELETE created waiting lock before the next UPDATE begins
locking.

This is backport of commit 0fa4dd0747
from 10.6.
This commit is contained in:
Vlad Lesin
2022-09-01 09:55:49 +03:00
parent 04899d6d91
commit 43745b7e17
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/innodb/r/lock_delete_updated.result
View File

@@ -1,11 +1,12 @@
CREATE TABLE t(a INT PRIMARY KEY) ENGINE=InnoDB; CREATE TABLE t(a INT PRIMARY KEY) ENGINE=InnoDB;
INSERT INTO t VALUES (3); INSERT INTO t VALUES (3);
BEGIN; BEGIN;
connection default;
UPDATE t SET a = 2; UPDATE t SET a = 2;
connect con1,localhost,root; connect con1,localhost,root;
SET DEBUG_SYNC="lock_wait_suspend_thread_enter SIGNAL del_locked";
DELETE FROM t; DELETE FROM t;
connection default; connection default;
SET DEBUG_SYNC="now WAIT_FOR del_locked";
UPDATE t SET a = 1; UPDATE t SET a = 1;
COMMIT; COMMIT;
connection con1; connection con1;
@@ -17,4 +18,5 @@ connection default;
SELECT count(*) FROM t; SELECT count(*) FROM t;
count(*) count(*)
1 1
SET DEBUG_SYNC="reset";
DROP TABLE t; DROP TABLE t;

12
mysql-test/suite/innodb/t/lock_delete_updated.test
View File

@@ -1,23 +1,20 @@
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/count_sessions.inc --source include/count_sessions.inc
--source include/have_debug.inc
--source include/have_debug_sync.inc
CREATE TABLE t(a INT PRIMARY KEY) ENGINE=InnoDB; CREATE TABLE t(a INT PRIMARY KEY) ENGINE=InnoDB;
INSERT INTO t VALUES (3); INSERT INTO t VALUES (3);
BEGIN; BEGIN;
connection default;
UPDATE t SET a = 2; UPDATE t SET a = 2;
connect con1,localhost,root; connect con1,localhost,root;
SET DEBUG_SYNC="lock_wait_suspend_thread_enter SIGNAL del_locked";
send DELETE FROM t; send DELETE FROM t;
connection default; connection default;
let $wait_condition= SET DEBUG_SYNC="now WAIT_FOR del_locked";
select count(*) = 1 from information_schema.processlist
where state = "Updating" and info = "DELETE FROM t";
--source include/wait_condition.inc
UPDATE t SET a = 1; UPDATE t SET a = 1;
COMMIT; COMMIT;
@@ -30,5 +27,6 @@ connection default;
--echo # The above DELETE must delete all the rows in the table, so the --echo # The above DELETE must delete all the rows in the table, so the
--echo # following SELECT must show 0 rows. --echo # following SELECT must show 0 rows.
SELECT count(*) FROM t; SELECT count(*) FROM t;
SET DEBUG_SYNC="reset";
DROP TABLE t; DROP TABLE t;
--source include/wait_until_count_sessions.inc --source include/wait_until_count_sessions.inc