1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

MDEV-33935 fix deadlock counter

- The deadlock counter was moved from
Deadlock::find_cycle into Deadlock::report, because
the find_cycle method is called multiple times during deadlock
detection flow, which means it shouldn't have such side effects.
But report() can, which called only once for
a victim transaction.
- Also the deadlock_detect.test and *.result test case
has been extended to handle the fix.
This commit is contained in:
Iaroslav Babanin
2024-05-15 17:42:08 +03:00
committed by Marko Mäkelä
parent ee974ca5e0
commit 5d49a2add7
4 changed files with 28 additions and 4 deletions

View File

@@ -3,7 +3,12 @@ CREATE TABLE t1(
id INT,
PRIMARY KEY(id)
) ENGINE=InnoDB;
CREATE TABLE dl(
id INT UNSIGNED PRIMARY KEY AUTO_INCREMENT,
cnt INT UNSIGNED
) ENGINE=InnoDB;
INSERT INTO t1 VALUES(1), (2), (3);
INSERT INTO dl(cnt) SELECT variable_value FROM information_schema.global_status WHERE variable_name LIKE 'Innodb_deadlocks';
BEGIN;
SELECT * FROM t1 WHERE id = 1 LOCK IN SHARE MODE;
connect con1,localhost,root,,;
@@ -20,5 +25,8 @@ disconnect con1;
ROLLBACK;
disconnect con2;
connection default;
'Deadlock counter is valid';
1
ROLLBACK;
DROP TABLE t1;
DROP TABLE dl;