mirror of
https://github.com/MariaDB/server.git
synced 2025-01-27 17:33:44 +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
268 lines
6.7 KiB
Text
268 lines
6.7 KiB
Text
--source include/have_metadata_lock_info.inc
|
|
-- source include/have_innodb.inc
|
|
|
|
--disable_query_log
|
|
call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
|
|
--enable_query_log
|
|
|
|
# Save the initial number of concurrent sessions.
|
|
--source include/count_sessions.inc
|
|
|
|
set @old_innodb_lock_wait_timeout=@@global.innodb_lock_wait_timeout;
|
|
set global innodb_lock_wait_timeout=300;
|
|
set session innodb_lock_wait_timeout=300;
|
|
|
|
call mtr.add_suppression("Deadlock found when trying to get lock; try restarting transaction");
|
|
|
|
--echo #
|
|
--echo # Bug #22876 Four-way deadlock
|
|
--echo #
|
|
|
|
--disable_warnings
|
|
DROP TABLE IF EXISTS t1;
|
|
--enable_warnings
|
|
|
|
connect (con1,localhost,root,,);
|
|
connect (con2,localhost,root,,);
|
|
connect (con3,localhost,root,,);
|
|
|
|
connection con1;
|
|
set @@autocommit=0;
|
|
CREATE TABLE t1(s1 INT UNIQUE) ENGINE=innodb;
|
|
# MDEV-515 takes X-lock on the table for the first insert.
|
|
# So concurrent DML won't happen on the table
|
|
INSERT INTO t1 VALUES (100);
|
|
COMMIT;
|
|
|
|
INSERT INTO t1 VALUES (1);
|
|
|
|
connection con2;
|
|
set @@autocommit=0;
|
|
INSERT INTO t1 VALUES (2);
|
|
--send INSERT INTO t1 VALUES (1)
|
|
|
|
connection con3;
|
|
set @@autocommit=0;
|
|
--send DROP TABLE t1
|
|
|
|
connection con1;
|
|
--echo # Waiting for until transaction will be locked inside innodb subsystem
|
|
let $wait_condition=
|
|
SELECT COUNT(*) = 1 FROM information_schema.innodb_trx
|
|
WHERE trx_query = 'INSERT INTO t1 VALUES (1)' AND
|
|
trx_operation_state = 'inserting' AND
|
|
trx_state = 'LOCK WAIT';
|
|
--source include/wait_condition.inc
|
|
let $wait_condition=
|
|
SELECT COUNT(*) = 1 FROM information_schema.processlist
|
|
WHERE info = "DROP TABLE t1" and
|
|
state = "Waiting for table metadata lock";
|
|
--source include/wait_condition.inc
|
|
--echo # Connection 1 is now holding the lock.
|
|
--echo # Issuing insert from connection 1 while connection 2&3
|
|
--echo # is waiting for the lock should give a deadlock error.
|
|
--error ER_LOCK_DEADLOCK
|
|
INSERT INTO t1 VALUES (2);
|
|
|
|
--echo # Cleanup
|
|
connection con2;
|
|
--reap
|
|
commit;
|
|
set @@autocommit=1;
|
|
connection con1;
|
|
commit;
|
|
set @@autocommit=1;
|
|
connection con3;
|
|
--reap
|
|
set @@autocommit=1;
|
|
connection default;
|
|
|
|
disconnect con1;
|
|
disconnect con2;
|
|
disconnect con3;
|
|
|
|
|
|
--echo #
|
|
--echo # Test for bug #37346 "innodb does not detect deadlock between update
|
|
--echo # and alter table".
|
|
--echo #
|
|
--disable_warnings
|
|
drop table if exists t1;
|
|
--enable_warnings
|
|
create table t1 (c1 int primary key, c2 int, c3 int) engine=InnoDB;
|
|
insert into t1 values (1,1,0),(2,2,0),(3,3,0),(4,4,0),(5,5,0);
|
|
begin;
|
|
--echo # Run statement which acquires X-lock on one of table's rows.
|
|
update t1 set c3=c3+1 where c2=3;
|
|
|
|
--echo #
|
|
connect (con37346,localhost,root,,test,,);
|
|
connection con37346;
|
|
--echo # The below ALTER TABLE statement should wait till transaction
|
|
--echo # in connection 'default' is complete and then succeed.
|
|
--echo # It should not deadlock or fail with ER_LOCK_DEADLOCK error.
|
|
--echo # Sending:
|
|
--send alter table t1 add column c4 int;
|
|
|
|
--echo #
|
|
connection default;
|
|
--echo # Wait until the above ALTER TABLE gets blocked because this
|
|
--echo # connection holds SW metadata lock on table to be altered.
|
|
let $wait_condition=
|
|
select count(*) = 1 from information_schema.processlist
|
|
where state = "Waiting for table metadata lock" and
|
|
info = "alter table t1 add column c4 int";
|
|
--source include/wait_condition.inc
|
|
|
|
--echo # The below statement should succeed. It should not
|
|
--echo # deadlock or end with ER_LOCK_DEADLOCK error.
|
|
update t1 set c3=c3+1 where c2=4;
|
|
|
|
--echo # Unblock ALTER TABLE by committing transaction.
|
|
commit;
|
|
|
|
--echo #
|
|
connection con37346;
|
|
--echo # Reaping ALTER TABLE.
|
|
--reap
|
|
|
|
--echo #
|
|
connection default;
|
|
disconnect con37346;
|
|
drop table t1;
|
|
|
|
--echo #
|
|
--echo # Bug#53798 OPTIMIZE TABLE breaks repeatable read
|
|
--echo #
|
|
|
|
--disable_warnings
|
|
DROP TABLE IF EXISTS t1;
|
|
--enable_warnings
|
|
|
|
CREATE TABLE t1 (a INT) engine=innodb;
|
|
INSERT INTO t1 VALUES (1), (2), (3);
|
|
|
|
connect (con1, localhost, root);
|
|
START TRANSACTION WITH CONSISTENT SNAPSHOT;
|
|
SELECT * FROM t1;
|
|
|
|
connection default;
|
|
--echo # This should block
|
|
--echo # Sending:
|
|
--send OPTIMIZE TABLE t1
|
|
|
|
connection con1;
|
|
let $wait_condition=SELECT COUNT(*)=1 FROM information_schema.processlist
|
|
WHERE state='Waiting for table metadata lock' AND info='OPTIMIZE TABLE t1';
|
|
--source include/wait_condition.inc
|
|
SELECT * FROM t1;
|
|
COMMIT;
|
|
|
|
connection default;
|
|
--echo # Reaping OPTIMIZE TABLE t1
|
|
--reap
|
|
disconnect con1;
|
|
DROP TABLE t1;
|
|
|
|
|
|
--echo #
|
|
--echo # Bug#49891 View DDL breaks REPEATABLE READ
|
|
--echo #
|
|
|
|
--disable_warnings
|
|
DROP TABLE IF EXISTS t1, t2;
|
|
DROP VIEW IF EXISTS v2;
|
|
--enable_warnings
|
|
|
|
CREATE TABLE t1 ( f1 INTEGER ) ENGINE = innodb;
|
|
CREATE TABLE t2 ( f1 INTEGER );
|
|
CREATE VIEW v1 AS SELECT 1 FROM t1;
|
|
|
|
connect (con2, localhost, root);
|
|
connect (con3, localhost, root);
|
|
|
|
connection con3;
|
|
LOCK TABLE t1 WRITE;
|
|
|
|
connection default;
|
|
START TRANSACTION;
|
|
# This should block due to t1 being locked.
|
|
--echo # Sending:
|
|
--send SELECT * FROM v1
|
|
|
|
connection con2;
|
|
--echo # Waiting for 'SELECT * FROM v1' to sync in.
|
|
let $wait_condition=
|
|
SELECT COUNT(*) = 1 FROM information_schema.processlist
|
|
WHERE state = "Waiting for table metadata lock" AND info = "SELECT * FROM v1";
|
|
--source include/wait_condition.inc
|
|
# This should block due to v1 being locked.
|
|
--echo # Sending:
|
|
--send ALTER VIEW v1 AS SELECT 2 FROM t2
|
|
|
|
connection con3;
|
|
--echo # Waiting for 'ALTER VIEW v1 AS SELECT 2 FROM t2' to sync in.
|
|
let $wait_condition=
|
|
SELECT COUNT(*) = 1 FROM information_schema.processlist
|
|
WHERE state = "Waiting for table metadata lock" AND
|
|
info = "ALTER VIEW v1 AS SELECT 2 FROM t2";
|
|
--source include/wait_condition.inc
|
|
# Unlock t1 allowing SELECT * FROM v1 to proceed.
|
|
UNLOCK TABLES;
|
|
|
|
connection default;
|
|
--echo # Reaping: SELECT * FROM v1
|
|
--reap
|
|
SELECT * FROM v1;
|
|
COMMIT;
|
|
|
|
connection con2;
|
|
--echo # Reaping: ALTER VIEW v1 AS SELECT 2 FROM t2
|
|
--reap
|
|
|
|
connection default;
|
|
DROP TABLE t1, t2;
|
|
DROP VIEW v1;
|
|
disconnect con2;
|
|
disconnect con3;
|
|
|
|
|
|
--echo #
|
|
--echo # Bug#11815600 [ERROR] INNODB COULD NOT FIND INDEX PRIMARY
|
|
--echo # KEY NO 0 FOR TABLE IN ERROR LOG
|
|
--echo #
|
|
|
|
--disable_warnings
|
|
DROP TABLE IF EXISTS t1;
|
|
--enable_warnings
|
|
|
|
--connect (con1,localhost,root)
|
|
|
|
connection default;
|
|
CREATE TABLE t1 (id INT PRIMARY KEY, value INT) ENGINE = InnoDB;
|
|
INSERT INTO t1 VALUES (1, 12345);
|
|
START TRANSACTION;
|
|
SELECT * FROM t1;
|
|
|
|
--connection con1
|
|
SET lock_wait_timeout=1;
|
|
# Test with two timeouts, as the first version of this patch
|
|
# only worked with one timeout.
|
|
--error ER_LOCK_WAIT_TIMEOUT
|
|
ALTER TABLE t1 ADD INDEX idx(value);
|
|
--error ER_LOCK_WAIT_TIMEOUT
|
|
ALTER TABLE t1 ADD INDEX idx(value);
|
|
|
|
--connection default
|
|
SELECT * FROM t1;
|
|
COMMIT;
|
|
DROP TABLE t1;
|
|
disconnect con1;
|
|
|
|
|
|
# Check that all connections opened by test cases in this file are really
|
|
# gone so execution of other tests won't be affected by their presence.
|
|
--source include/wait_until_count_sessions.inc
|
|
|
|
set global innodb_lock_wait_timeout=@old_innodb_lock_wait_timeout;
|
|
|