mirror of
https://github.com/MariaDB/server.git
synced 2025-02-09 23:24:11 +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
81 lines
2.3 KiB
Text
81 lines
2.3 KiB
Text
--source include/have_innodb.inc
|
|
--source include/have_binlog_format_statement.inc
|
|
--let $rpl_topology=1->2
|
|
--source include/rpl_init.inc
|
|
|
|
--disable_query_log
|
|
call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
|
|
--enable_query_log
|
|
|
|
--connection server_1
|
|
ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB;
|
|
CREATE TABLE t1 (a int PRIMARY KEY, b INT) ENGINE=InnoDB;
|
|
CREATE TABLE t2 (a int PRIMARY KEY, b INT) ENGINE=InnoDB;
|
|
INSERT INTO t1 VALUES (1,0), (2,0), (3,0);
|
|
INSERT INTO t2 VALUES (1,0), (2,0);
|
|
--save_master_pos
|
|
|
|
|
|
--connection server_2
|
|
--sync_with_master
|
|
SET @old_isolation= @@GLOBAL.tx_isolation;
|
|
SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads;
|
|
--source include/stop_slave.inc
|
|
SET GLOBAL TRANSACTION ISOLATION LEVEL READ COMMITTED;
|
|
SET GLOBAL slave_parallel_threads=10;
|
|
CHANGE MASTER TO master_use_gtid=slave_pos;
|
|
SET @old_parallel_mode=@@GLOBAL.slave_parallel_mode;
|
|
SET GLOBAL slave_parallel_mode='aggressive';
|
|
|
|
|
|
--echo *** Test that we replicate correctly when using READ COMMITTED and --log-slave-updates=0 on the slave ***
|
|
|
|
--connection server_1
|
|
|
|
INSERT INTO t1 SELECT 4, COUNT(*) FROM t2;
|
|
INSERT INTO t2 SELECT 4, COUNT(*) FROM t1;
|
|
|
|
INSERT INTO t1 SELECT 5, COUNT(*) FROM t2;
|
|
INSERT INTO t2 SELECT 5, COUNT(*) FROM t1;
|
|
|
|
INSERT INTO t2 SELECT 6, COUNT(*) FROM t1;
|
|
INSERT INTO t1 SELECT 6, COUNT(*) FROM t2;
|
|
|
|
INSERT INTO t1 SELECT 7, COUNT(*) FROM t2;
|
|
INSERT INTO t2 SELECT 7, COUNT(*) FROM t1;
|
|
|
|
INSERT INTO t2 SELECT 8, COUNT(*) FROM t1;
|
|
INSERT INTO t1 SELECT 8, COUNT(*) FROM t2;
|
|
|
|
INSERT INTO t2 SELECT 9, COUNT(*) FROM t1;
|
|
INSERT INTO t1 SELECT 9, COUNT(*) FROM t2;
|
|
|
|
INSERT INTO t1 SELECT 10, COUNT(*) FROM t2;
|
|
INSERT INTO t2 SELECT 10, COUNT(*) FROM t1;
|
|
|
|
SELECT * FROM t1 ORDER BY a;
|
|
SELECT * FROM t2 ORDER BY a;
|
|
--source include/save_master_gtid.inc
|
|
|
|
--connection server_2
|
|
--source include/start_slave.inc
|
|
--source include/sync_with_master_gtid.inc
|
|
SELECT * FROM t1 ORDER BY a;
|
|
SELECT * FROM t2 ORDER BY a;
|
|
|
|
|
|
--connection server_2
|
|
--source include/stop_slave.inc
|
|
SET GLOBAL tx_isolation= @old_isolation;
|
|
SET GLOBAL slave_parallel_mode=@old_parallel_mode;
|
|
SET GLOBAL slave_parallel_threads=@old_parallel_threads;
|
|
--source include/start_slave.inc
|
|
|
|
--connection server_1
|
|
DROP TABLE t1, t2;
|
|
|
|
--connection server_2
|
|
call mtr.add_suppression("Deadlock found when trying to get lock.*");
|
|
|
|
--source include/rpl_end.inc
|
|
|