mirror of
https://github.com/MariaDB/server.git
synced 2025-02-05 13:22:17 +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
54 lines
1.3 KiB
Text
54 lines
1.3 KiB
Text
#
|
|
# Test of wrong call to unlock_row
|
|
# MDEV-5629 Failing assertion: state == TRX_STATE_NOT_STARTED on
|
|
# concurrent CREATE OR REPLACE and transactional UPDATE
|
|
#
|
|
|
|
--disable_query_log
|
|
call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
|
|
--enable_query_log
|
|
|
|
--source include/have_innodb.inc
|
|
|
|
CREATE TABLE t1 (a INT, b INT) ENGINE=InnoDB;
|
|
INSERT INTO t1 VALUES (1,1),(2,2);
|
|
|
|
CREATE TABLE t2 (c INT, d INT) ENGINE=InnoDB;
|
|
INSERT INTO t2 VALUES (1,1), (2,2);
|
|
|
|
CREATE TABLE t3 (e INT) ENGINE=InnoDB;
|
|
CREATE TABLE t4 ENGINE=InnoDB AS SELECT * FROM t2;
|
|
|
|
--connect (con11,localhost,root,,test)
|
|
|
|
BEGIN;
|
|
UPDATE t1 SET a = 0 WHERE a = ( SELECT e FROM t3 );
|
|
|
|
--connect (con12,localhost,root,,test)
|
|
|
|
--send
|
|
UPDATE t4 SET d = 1 WHERE d in ( SELECT a FROM t1 ) ORDER BY c LIMIT 6;
|
|
|
|
--connection con11
|
|
|
|
# Wait for con12 to start waiting for con11
|
|
let $wait_condition=
|
|
select count(*) = 1 from information_schema.innodb_trx
|
|
where trx_state = "lock wait" and
|
|
trx_query like "%SELECT a FROM t1%";
|
|
--source include/wait_condition.inc
|
|
|
|
UPDATE t4 SET d = 9;
|
|
|
|
--connection con12
|
|
--error ER_LOCK_DEADLOCK
|
|
--reap
|
|
--connection con11
|
|
commit;
|
|
--connection default
|
|
--disconnect con12
|
|
--disconnect con11
|
|
drop table t1,t2,t3,t4;
|
|
|
|
call mtr.add_suppression("Deadlock found when trying to get lock; try restarting transaction");
|
|
call mtr.add_suppression("Sort aborted.*");
|