mirror of
https://github.com/MariaDB/server.git
synced 2025-02-04 21:02: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
82 lines
1.9 KiB
Text
82 lines
1.9 KiB
Text
connection node_2;
|
|
connection node_1;
|
|
connection node_2;
|
|
call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
|
|
CREATE TABLE t1(a int not null primary key auto_increment,b int) engine=InnoDB;
|
|
insert into t1 values (NULL,1);
|
|
connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2;
|
|
connection node_2a;
|
|
call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
|
|
begin;
|
|
update t1 set a = 5;
|
|
connection node_2;
|
|
select * from t1;
|
|
a b
|
|
2 1
|
|
disconnect node_2a;
|
|
connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2;
|
|
connection node_2a;
|
|
begin;
|
|
update t1 set a =5;
|
|
connection node_2;
|
|
select * from t1;
|
|
a b
|
|
2 1
|
|
disconnect node_2a;
|
|
connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2;
|
|
connection node_2a;
|
|
begin;
|
|
update t1 set a =5, b=2;
|
|
connection node_2;
|
|
ALTER TABLE t1 ADD UNIQUE KEY b1(b);
|
|
ALTER TABLE t1 DROP KEY b1;
|
|
select * from t1;
|
|
a b
|
|
2 1
|
|
disconnect node_2a;
|
|
connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2;
|
|
connection node_2a;
|
|
begin;
|
|
update t1 set a =5, b=2;
|
|
connect node_2b, 127.0.0.1, root, , test, $NODE_MYPORT_2;
|
|
connection node_2b;
|
|
begin;
|
|
update t1 set a =6, b=7;
|
|
connection node_2;
|
|
ALTER TABLE t1 ADD UNIQUE KEY b2(b);
|
|
ALTER TABLE t1 DROP KEY b2;
|
|
select * from t1;
|
|
a b
|
|
2 1
|
|
disconnect node_2a;
|
|
disconnect node_2b;
|
|
connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2;
|
|
connect node_2b, 127.0.0.1, root, , test, $NODE_MYPORT_2;
|
|
connection node_2a;
|
|
SET SESSION wsrep_on=OFF;
|
|
begin;
|
|
update t1 set a =5, b=2;
|
|
connection node_2;
|
|
ALTER TABLE t1 ADD UNIQUE KEY b3(b);
|
|
connection node_2b;
|
|
SET SESSION wsrep_sync_wait=0;
|
|
connection node_2a;
|
|
select * from t1;
|
|
a b
|
|
5 2
|
|
commit;
|
|
connection node_2;
|
|
disconnect node_2a;
|
|
disconnect node_2b;
|
|
connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2;
|
|
connection node_2a;
|
|
SET SESSION wsrep_on=OFF;
|
|
begin;
|
|
update t1 set a =5, b=2;
|
|
connection node_2;
|
|
select * from t1;
|
|
a b
|
|
5 2
|
|
disconnect node_2a;
|
|
connection node_1;
|
|
drop table t1;
|