mirror of
https://github.com/MariaDB/server.git
synced 2025-12-07 17:42:39 +03:00
8ff1096999
The issue is that trx_t::lock.was_chosen_as_deadlock_victim can be reset
before the transaction check it and set trx_t::error_state.
The fix is to reset trx_t::lock.was_chosen_as_deadlock_victim only in
trx_t::commit_in_memory(), which is invoked on full rollback. There is
also no need to have separate bit in
trx_t::lock.was_chosen_as_deadlock_victim to flag transaction it was
chosen as a victim of Galera conflict resolution, the same variable can be
used for both cases except debug build. For debug build we need to
distinguish deadlock and Galera's abort victims for debug checks. Also
there is no need to check for deadlock in lock_table_enqueue_waiting() for
Galera as the coresponding check presents in lock_wait().
Local variable "error_state" in lock_wait() was replaced with
trx->error_state, because before the replace
lock_sys_t::cancel<false>(trx, lock) and lock_sys.deadlock_check() could
change trx->error_state, which then could be overwritten with the local
"error_state" variable value.
The lock_wait_suspend_thread_enter DEBUG_SYNC point name is misleading,
because lock_wait_suspend_thread was eliminated in e71e613. It was renamed
to lock_wait_start.
Reviewed by: Marko Mäkelä, Jan Lindström.
36 lines
1.3 KiB
Plaintext
36 lines
1.3 KiB
Plaintext
CREATE TABLE t (a int PRIMARY KEY, b int NOT NULL UNIQUE) engine = InnoDB;
|
|
connect prevent_purge,localhost,root,,;
|
|
start transaction with consistent snapshot;
|
|
connect con_del_1,localhost,root,,;
|
|
INSERT INTO t VALUES (20,20);
|
|
SET DEBUG_SYNC = 'innodb_row_search_for_mysql_exit SIGNAL first_del_row_search_mvcc_finished WAIT_FOR first_del_cont';
|
|
DELETE FROM t WHERE b = 20;
|
|
connect con_ins_1,localhost,root,,;
|
|
SET DEBUG_SYNC = 'now WAIT_FOR first_del_row_search_mvcc_finished';
|
|
SET DEBUG_SYNC = 'lock_wait_start SIGNAL first_ins_locked';
|
|
SET DEBUG_SYNC = 'ib_after_row_insert SIGNAL first_ins_row_inserted WAIT_FOR first_ins_cont';
|
|
INSERT INTO t VALUES(10, 20);
|
|
connect con_del_2,localhost,root,,;
|
|
SET DEBUG_SYNC = 'now WAIT_FOR first_ins_locked';
|
|
SET DEBUG_SYNC = 'lock_wait_start SIGNAL second_del_locked';
|
|
DELETE FROM t WHERE b = 20;
|
|
connection default;
|
|
SET DEBUG_SYNC = 'now WAIT_FOR second_del_locked';
|
|
SET DEBUG_SYNC = 'now SIGNAL first_del_cont';
|
|
SET DEBUG_SYNC = 'now WAIT_FOR first_ins_row_inserted';
|
|
connection con_del_1;
|
|
connection default;
|
|
disconnect prevent_purge;
|
|
InnoDB 0 transactions not purged
|
|
SET DEBUG_SYNC = 'now SIGNAL first_ins_cont';
|
|
connection con_del_2;
|
|
connection con_ins_1;
|
|
connection default;
|
|
INSERT INTO t VALUES(30, 20);
|
|
disconnect con_ins_1;
|
|
disconnect con_del_1;
|
|
disconnect con_del_2;
|
|
connection default;
|
|
SET DEBUG_SYNC = 'RESET';
|
|
DROP TABLE t;
|