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
44 lines
1,022 B
PHP
44 lines
1,022 B
PHP
#
|
|
# Bug #24200: Provide backwards compatibility mode for 4.x "rollback on
|
|
# transaction timeout"
|
|
#
|
|
--disable_query_log
|
|
call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
|
|
--enable_query_log
|
|
|
|
--disable_warnings
|
|
drop table if exists t1;
|
|
--enable_warnings
|
|
|
|
show variables like 'innodb_rollback_on_timeout';
|
|
create table t1 (a int unsigned not null primary key) engine = innodb;
|
|
insert into t1 values (1);
|
|
commit;
|
|
connect (con1,localhost,root,,);
|
|
connect (con2,localhost,root,,);
|
|
|
|
connection con2;
|
|
begin work;
|
|
insert into t1 values (2);
|
|
select * from t1;
|
|
|
|
connection con1;
|
|
begin work;
|
|
insert into t1 values (5);
|
|
# Lock wait timeout set to 2 seconds in <THIS TEST>-master.opt; this
|
|
# statement will time out; in 5.0.13+, it will not roll back transaction.
|
|
--error ER_LOCK_WAIT_TIMEOUT
|
|
insert into t1 values (2);
|
|
# On 5.0.13+, this should give ==> 1, 5
|
|
select * from t1;
|
|
commit;
|
|
|
|
connection con2;
|
|
select * from t1;
|
|
commit;
|
|
|
|
connection default;
|
|
select * from t1;
|
|
drop table t1;
|
|
disconnect con1;
|
|
disconnect con2;
|