mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
ddd7d5d8e3
Under unknown circumstances, the SQL layer may wrongly disregard an invocation of thd_mark_transaction_to_rollback() when an InnoDB transaction had been aborted (rolled back) due to one of the following errors: * HA_ERR_LOCK_DEADLOCK * HA_ERR_RECORD_CHANGED (if innodb_snapshot_isolation=ON) * HA_ERR_LOCK_WAIT_TIMEOUT (if innodb_rollback_on_timeout=ON) Such an error used to cause a crash of InnoDB during transaction commit. These changes aim to catch and report the error earlier, so that not only this crash can be avoided but also the original root cause be found and fixed more easily later. The idea of this fix is from Michael 'Monty' Widenius. HA_ERR_ROLLBACK: A new error code that will be translated into ER_ROLLBACK_ONLY, signalling that the current transaction has been aborted and the only allowed action is ROLLBACK. trx_t::state: Add TRX_STATE_ABORTED that is like TRX_STATE_NOT_STARTED, but noting that the transaction had been rolled back and aborted. trx_t::is_started(): Replaces trx_is_started(). ha_innobase: Check the transaction state in various places. Simplify the logic around SAVEPOINT. ha_innobase::is_valid_trx(): Replaces ha_innobase::is_read_only(). The InnoDB logic around transaction savepoints, commit, and rollback was unnecessarily complex and might have contributed to this inconsistency. So, we are simplifying that logic as well. trx_savept_t: Replace with const undo_no_t*. When we rollback to a savepoint, all we need to know is the number of undo log records that must survive. trx_named_savept_t, DB_NO_SAVEPOINT: Remove. We can store undo_no_t directly in the space allocated at innobase_hton->savepoint_offset. fts_trx_create(): Do not copy previous savepoints. fts_savepoint_rollback(): If a savepoint was not found, roll back everything after the default savepoint of fts_trx_create(). The test innodb_fts.savepoint is extended to cover this code. Reviewed by: Vladislav Lesin Tested by: Matthias Leich
64 lines
1.7 KiB
Text
64 lines
1.7 KiB
Text
-- source include/have_log_bin.inc
|
|
-- source include/have_innodb.inc
|
|
-- source include/not_binlog_format_row.inc
|
|
|
|
--disable_query_log
|
|
call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
|
|
--enable_query_log
|
|
|
|
--echo #
|
|
--echo # Bug #39022: Mysql randomly crashing in lock_sec_rec_cons_read_sees
|
|
--echo #
|
|
|
|
--disable_ps2_protocol
|
|
call mtr.add_suppression("Deadlock found when trying to get lock; try restarting transaction");
|
|
|
|
CREATE TABLE t1(a TINYINT NOT NULL,b TINYINT,PRIMARY KEY(b)) ENGINE=innodb;
|
|
CREATE TABLE t2(d TINYINT NOT NULL,UNIQUE KEY(d)) ENGINE=innodb;
|
|
INSERT INTO t1 VALUES (13,0),(8,1),(9,2),(6,3),
|
|
(11,5),(11,6),(7,7),(7,8),(4,9),(6,10),(3,11),(11,12),
|
|
(12,13),(7,14);
|
|
INSERT INTO t2 VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9),(10),
|
|
(11),(12),(13),(14);
|
|
|
|
connect (thread1, localhost, root,,);
|
|
connect (thread2, localhost, root,,);
|
|
|
|
connection thread1;
|
|
START TRANSACTION;
|
|
|
|
connection thread2;
|
|
REPLACE INTO t2 VALUES (-17);
|
|
SELECT d FROM t2,t1 WHERE d=(SELECT MAX(a) FROM t1 WHERE t1.a > t2.d) LOCK IN SHARE MODE;
|
|
|
|
connection thread1;
|
|
REPLACE INTO t1(a,b) VALUES (67,20);
|
|
|
|
connection thread2;
|
|
COMMIT;
|
|
START TRANSACTION;
|
|
REPLACE INTO t1(a,b) VALUES (65,-50);
|
|
REPLACE INTO t2 VALUES (-91);
|
|
send;
|
|
SELECT d FROM t2,t1 WHERE d=(SELECT MAX(a) FROM t1 WHERE t1.a > t2.d) LOCK IN SHARE MODE; #waits
|
|
|
|
connection thread1;
|
|
|
|
--echo # should not crash
|
|
--error ER_LOCK_DEADLOCK,ER_LOCK_WAIT_TIMEOUT
|
|
SELECT d FROM t2,t1 WHERE d=(SELECT MAX(a) FROM t1 WHERE t1.a > t2.d) LOCK IN SHARE MODE; #crashes
|
|
|
|
connection thread2;
|
|
REAP;
|
|
|
|
disconnect thread2;
|
|
--source include/wait_until_disconnected.inc
|
|
|
|
connection thread1;
|
|
disconnect thread1;
|
|
--source include/wait_until_disconnected.inc
|
|
|
|
connection default;
|
|
|
|
DROP TABLE t1,t2;
|
|
--enable_ps2_protocol
|