mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 02:05:57 +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
228 lines
5.5 KiB
Text
228 lines
5.5 KiB
Text
--source include/have_innodb.inc
|
|
--source include/have_partition.inc
|
|
|
|
--disable_query_log
|
|
call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
|
|
--enable_query_log
|
|
|
|
#
|
|
# Check and select innodb lock type
|
|
#
|
|
|
|
set global innodb_table_locks=1;
|
|
|
|
select @@innodb_table_locks;
|
|
|
|
#
|
|
# Testing of explicit table locks with enforced table locks
|
|
#
|
|
|
|
set @@innodb_table_locks=1;
|
|
|
|
connect (con1,localhost,root,,);
|
|
create table t1 (id integer, x integer) engine=INNODB;
|
|
insert into t1 values(0, 0);
|
|
set autocommit=0;
|
|
SELECT * from t1 where id = 0 FOR UPDATE;
|
|
|
|
connect (con2,localhost,root,,);
|
|
set autocommit=0;
|
|
|
|
# The following statement should hang because con1 is locking the page
|
|
--send
|
|
lock table t1 write;
|
|
--sleep 2
|
|
|
|
connection con1;
|
|
update t1 set x=1 where id = 0;
|
|
select * from t1;
|
|
commit;
|
|
|
|
connection con2;
|
|
reap;
|
|
update t1 set x=2 where id = 0;
|
|
commit;
|
|
unlock tables;
|
|
|
|
connection con1;
|
|
select * from t1;
|
|
commit;
|
|
|
|
drop table t1;
|
|
|
|
--echo #
|
|
--echo # Old lock method (where LOCK TABLE was ignored by InnoDB) no longer
|
|
--echo # works when LOCK TABLE ... WRITE is used due to fix for bugs #46272
|
|
--echo # "MySQL 5.4.4, new MDL: unnecessary and bug #37346 "innodb does not
|
|
--echo # detect deadlock between update and alter table".
|
|
--echo # After WL#6671 "Improve scalability by not using thr_lock.c locks
|
|
--echo # for InnoDB tables" was implemented it no longer works for LOCK TABLES
|
|
--echo # ,,, READ as well.
|
|
--echo # LOCK TABLES locks are now completely handled by MDL subsystem.
|
|
--echo #
|
|
|
|
set @@innodb_table_locks=0;
|
|
|
|
create table t1 (id integer primary key, x integer) engine=INNODB;
|
|
insert into t1 values(0, 0),(1,1),(2,2);
|
|
commit;
|
|
SELECT * from t1 where id = 0 FOR UPDATE;
|
|
|
|
connection con2;
|
|
set autocommit=0;
|
|
set @@innodb_table_locks=0;
|
|
|
|
--echo # The following statement should block because SQL-level lock
|
|
--echo # is taken on t1 which will wait until concurrent transaction
|
|
--echo # is commited.
|
|
--echo # Sending:
|
|
--send lock table t1 write;
|
|
|
|
connection con1;
|
|
--echo # Wait until LOCK TABLE is blocked on SQL-level lock.
|
|
let $wait_condition=
|
|
select count(*) = 1 from information_schema.processlist
|
|
where state = "Waiting for table metadata lock" and
|
|
info = "lock table t1 write";
|
|
--source include/wait_condition.inc
|
|
--echo # We should be able to do UPDATEs and SELECTs within transaction.
|
|
update t1 set x=1 where id = 0;
|
|
select * from t1;
|
|
--echo # Unblock LOCK TABLE.
|
|
commit;
|
|
|
|
connection con2;
|
|
--echo # Reap LOCK TABLE.
|
|
--reap
|
|
unlock tables;
|
|
|
|
connection con1;
|
|
|
|
select * from t1 where id = 0 for update;
|
|
|
|
connection con2;
|
|
--echo # The following statement should block because SQL-level lock
|
|
--echo # is taken on t1 which will wait until concurrent transaction
|
|
--echo # is commited.
|
|
--echo # Sending:
|
|
--send lock table t1 read;
|
|
|
|
connection con1;
|
|
--echo # Wait until LOCK TABLE is blocked on SQL-level lock.
|
|
let $wait_condition=
|
|
select count(*) = 1 from information_schema.processlist
|
|
where state = "Waiting for table metadata lock" and
|
|
info = "lock table t1 read";
|
|
--source include/wait_condition.inc
|
|
--echo # We should be able to do UPDATEs and SELECTs within transaction.
|
|
update t1 set x=2 where id = 0;
|
|
select * from t1;
|
|
--echo # Unblock LOCK TABLE.
|
|
commit;
|
|
|
|
connection con2;
|
|
--echo # Reap LOCK TABLE.
|
|
--reap
|
|
unlock tables;
|
|
|
|
connection default;
|
|
|
|
drop table t1;
|
|
|
|
# End of 4.1 tests
|
|
|
|
--echo #
|
|
--echo #Bug#12842206 INNODB LOCKING REGRESSION FOR INSERT IGNORE
|
|
--echo #fixed by re-fixing Bug#7975
|
|
--echo #aka Bug#11759688 52020: InnoDB can still deadlock on just INSERT...
|
|
--echo #
|
|
|
|
connection default;
|
|
CREATE TABLE t1 (a INT PRIMARY KEY, b INT NOT NULL) ENGINE=InnoDB;
|
|
INSERT INTO t1 VALUES(3,1);
|
|
|
|
BEGIN;
|
|
# this used to wrongly acquire an X lock; now it takes an S lock
|
|
INSERT IGNORE INTO t1 VALUES(3,14);
|
|
|
|
connection con1;
|
|
BEGIN;
|
|
# this used to wrongly acquire an X lock; now it takes an S lock
|
|
INSERT IGNORE INTO t1 VALUES(3,23);
|
|
--send
|
|
SELECT * FROM t1 FOR UPDATE;
|
|
|
|
connection con2;
|
|
# Check that the above SELECT is blocked
|
|
let $wait_condition=
|
|
select count(*) = 1 from information_schema.processlist
|
|
where state = 'Sending data' and
|
|
info = 'SELECT * FROM t1 FOR UPDATE';
|
|
--source include/wait_condition.inc
|
|
disconnect con2;
|
|
|
|
connection default;
|
|
COMMIT;
|
|
connection con1;
|
|
reap;
|
|
COMMIT;
|
|
connection default;
|
|
DROP TABLE t1;
|
|
|
|
--echo #
|
|
--echo # MDEV-11080 InnoDB: Failing assertion:
|
|
--echo # table->n_waiting_or_granted_auto_inc_locks > 0
|
|
--echo #
|
|
|
|
CREATE TABLE t1 (pk INTEGER AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB;
|
|
INSERT INTO t1 VALUES (NULL),(NULL);
|
|
CREATE TABLE t2 LIKE t1;
|
|
|
|
BEGIN;
|
|
|
|
connection con1;
|
|
BEGIN;
|
|
DELETE FROM t2;
|
|
connection default;
|
|
--send LOCK TABLE t2 READ;
|
|
connection con1;
|
|
SET innodb_lock_wait_timeout= 1, lock_wait_timeout= 2;
|
|
--error 0,ER_LOCK_WAIT_TIMEOUT
|
|
INSERT INTO t2 SELECT * FROM t1;
|
|
COMMIT;
|
|
|
|
connection default;
|
|
reap;
|
|
UNLOCK TABLES;
|
|
DROP TABLE t1, t2;
|
|
|
|
--echo #
|
|
--echo # MDEV-16709 InnoDB: Error: trx already had an AUTO-INC lock
|
|
--echo #
|
|
|
|
CREATE TABLE t1 (pk INT AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDB
|
|
PARTITION BY key (pk) PARTITIONS 2;
|
|
# MDEV-515 takes X-lock on the table for the first insert.
|
|
# So concurrent insert won't happen on the table
|
|
INSERT INTO t1 VALUES(100);
|
|
INSERT INTO t1 VALUES(101);
|
|
|
|
CREATE TABLE t2 (a INT) ENGINE=InnoDB;
|
|
INSERT INTO t2 VALUES (1),(2),(3),(4),(5),(6);
|
|
|
|
CREATE TABLE t3 (b INT) ENGINE=InnoDB;
|
|
INSERT INTO t3 VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9);
|
|
|
|
connection con1;
|
|
send INSERT t1 SELECT NULL FROM t2;
|
|
|
|
connection default;
|
|
--error 0,ER_DUP_ENTRY,ER_LOCK_DEADLOCK
|
|
INSERT t1 SELECT NULL FROM t3;
|
|
|
|
connection con1;
|
|
--error 0,ER_DUP_ENTRY,ER_LOCK_DEADLOCK
|
|
reap;
|
|
disconnect con1;
|
|
connection default;
|
|
DROP TABLE t1, t2, t3;
|