mirror of
https://github.com/MariaDB/server.git
synced 2025-01-27 01:04:19 +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
171 lines
5.5 KiB
Text
171 lines
5.5 KiB
Text
--source include/have_partition.inc
|
|
--source include/have_innodb.inc
|
|
|
|
let $MYSQLD_DATADIR= `SELECT @@datadir`;
|
|
|
|
call mtr.add_suppression("InnoDB: Table .* does not exist in the InnoDB internal data dictionary .*");
|
|
call mtr.add_suppression("Deadlock found when trying to get lock; try restarting transaction");
|
|
--disable_query_log
|
|
call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
|
|
--enable_query_log
|
|
|
|
--echo #
|
|
--echo # Bug#11766879/Bug#60106: DIFF BETWEEN # OF INDEXES IN MYSQL VS INNODB,
|
|
--echo # PARTITONING, ON INDEX CREATE
|
|
--echo # Bug#12696518: MEMORY LEAKS IN HA_PARTITION (VALGRIND TESTS ON TRUNK)
|
|
--echo #
|
|
CREATE TABLE t1 (
|
|
id bigint NOT NULL AUTO_INCREMENT,
|
|
time date,
|
|
id2 bigint not null,
|
|
PRIMARY KEY (id,time)
|
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8
|
|
/*!50100 PARTITION BY RANGE(TO_DAYS(time))
|
|
(PARTITION p10 VALUES LESS THAN (734708) ENGINE = InnoDB,
|
|
PARTITION p20 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */;
|
|
|
|
INSERT INTO t1 (time,id2) VALUES ('2011-07-24',1);
|
|
INSERT INTO t1 (time,id2) VALUES ('2011-07-25',1);
|
|
INSERT INTO t1 (time,id2) VALUES ('2011-07-25',1);
|
|
|
|
--error ER_DUP_ENTRY
|
|
CREATE UNIQUE INDEX uk_time_id2 on t1(time,id2);
|
|
|
|
SELECT COUNT(*) FROM t1;
|
|
SHOW CREATE TABLE t1;
|
|
|
|
DROP TABLE t1;
|
|
|
|
call mtr.add_suppression("InnoDB: Error: table `test`.`t1` .* InnoDB internal");
|
|
--echo #
|
|
--echo # Bug#55091: Server crashes on ADD PARTITION after a failed attempt
|
|
--echo #
|
|
SET @old_innodb_file_per_table = @@global.innodb_file_per_table;
|
|
SET @old_innodb_strict_mode = @@global.innodb_strict_mode;
|
|
SET @@global.innodb_file_per_table = ON,
|
|
@@global.innodb_strict_mode = ON;
|
|
--disable_query_log
|
|
SET @save_innodb_read_only_compressed=@@GLOBAL.innodb_read_only_compressed;
|
|
SET GLOBAL innodb_read_only_compressed=OFF;
|
|
--enable_query_log
|
|
|
|
--connect(con1,localhost,root,,)
|
|
CREATE TABLE t1 (id INT NOT NULL
|
|
PRIMARY KEY,
|
|
user_num CHAR(10)
|
|
) ENGINE = InnoDB
|
|
KEY_BLOCK_SIZE=4
|
|
PARTITION BY HASH(id) PARTITIONS 1;
|
|
|
|
--replace_result #p# #P#
|
|
--list_files $MYSQLD_DATADIR/test t1*
|
|
SHOW CREATE TABLE t1;
|
|
|
|
SET GLOBAL innodb_file_per_table = OFF;
|
|
|
|
--disconnect con1
|
|
--connect(con2,localhost,root,,)
|
|
|
|
LOCK TABLE t1 WRITE;
|
|
|
|
--echo # ALTER fails because COMPRESSED/KEY_BLOCK_SIZE
|
|
--echo # are incompatible with innodb_file_per_table = OFF;
|
|
|
|
--replace_regex / - .*//
|
|
--error ER_GET_ERRNO
|
|
ALTER TABLE t1 ADD PARTITION PARTITIONS 1;
|
|
|
|
--replace_result #p# #P#
|
|
--list_files $MYSQLD_DATADIR/test t1*
|
|
--echo # This SET is not needed to reproduce the bug,
|
|
--echo # it is here just to make the test case more realistic
|
|
SET innodb_strict_mode = OFF;
|
|
|
|
ALTER TABLE t1 ADD PARTITION PARTITIONS 2;
|
|
--replace_result #p# #P#
|
|
--list_files $MYSQLD_DATADIR/test t1*
|
|
|
|
# really bug#56172
|
|
ALTER TABLE t1 REBUILD PARTITION p0;
|
|
|
|
UNLOCK TABLES;
|
|
SHOW CREATE TABLE t1;
|
|
DROP TABLE t1;
|
|
|
|
--disconnect con2
|
|
--connection default
|
|
SET @@global.innodb_strict_mode = @old_innodb_strict_mode;
|
|
SET @@global.innodb_file_per_table = @old_innodb_file_per_table;
|
|
--disable_query_log
|
|
SET GLOBAL innodb_read_only_compressed=@save_innodb_read_only_compressed;
|
|
--enable_query_log
|
|
|
|
#
|
|
# Bug#32430 - show engine innodb status causes errors
|
|
#
|
|
#change to "disable_service_connection" after fix MDEV-29278
|
|
--disable_view_protocol
|
|
SET @save_detect= @@GLOBAL.innodb_deadlock_detect;
|
|
SET @save_report= @@GLOBAL.innodb_deadlock_report;
|
|
SET GLOBAL innodb_deadlock_detect=ON;
|
|
SET GLOBAL innodb_deadlock_report=BASIC;
|
|
SET NAMES utf8;
|
|
CREATE TABLE `t``\""e` (a INT, PRIMARY KEY (a))
|
|
ENGINE=InnoDB
|
|
PARTITION BY RANGE (a)
|
|
SUBPARTITION BY HASH (a)
|
|
(PARTITION `p0``\""e` VALUES LESS THAN (100)
|
|
(SUBPARTITION `sp0``\""e`,
|
|
SUBPARTITION `sp1``\""e`),
|
|
PARTITION `p1``\""e` VALUES LESS THAN (MAXVALUE)
|
|
(SUBPARTITION `sp2``\""e`,
|
|
SUBPARTITION `sp3``\""e`));
|
|
INSERT INTO `t``\""e` VALUES (0), (2), (6), (10), (14), (18), (22);
|
|
START TRANSACTION;
|
|
connect(con1,localhost,root,,);
|
|
SET NAMES utf8;
|
|
START TRANSACTION;
|
|
connection default;
|
|
UPDATE `t``\""e` SET a = 16 WHERE a = 0;
|
|
connection con1;
|
|
UPDATE `t``\""e` SET a = 8 WHERE a = 22;
|
|
let $id_1= `SELECT CONNECTION_ID()`;
|
|
SEND;
|
|
UPDATE `t``\""e` SET a = 12 WHERE a = 0;
|
|
connection default;
|
|
let $wait_condition= SELECT COUNT(*)=2 FROM INFORMATION_SCHEMA.INNODB_LOCKS;
|
|
--source include/wait_condition.inc
|
|
--sorted_result
|
|
SELECT lock_table, COUNT(*) FROM INFORMATION_SCHEMA.INNODB_LOCKS
|
|
GROUP BY lock_table;
|
|
set @old_sql_mode = @@sql_mode;
|
|
set sql_mode = 'ANSI_QUOTES';
|
|
--sorted_result
|
|
SELECT lock_table, COUNT(*) FROM INFORMATION_SCHEMA.INNODB_LOCKS
|
|
GROUP BY lock_table;
|
|
set @@sql_mode = @old_sql_mode;
|
|
--error ER_LOCK_DEADLOCK
|
|
UPDATE `t``\""e` SET a = 4 WHERE a = 22;
|
|
--echo # First table reported in 'SHOW ENGINE InnoDB STATUS'
|
|
# RECORD LOCKS space id 0 page no 50 n bits 80 index `PRIMARY` in \
|
|
# Database `test`, Table `t1`, Partition `p0`, Subpartition `sp0` \
|
|
# trx id 0 775
|
|
# NOTE: replace_regex is very slow on match copy/past '(.*)' regex's
|
|
# on big texts, removing a lot of text before + after makes it much faster.
|
|
#/.*in (.*) trx.*/\1/
|
|
--replace_regex /.*RECORD LOCKS space id [0-9]* page no [0-9]* n bits [0-9]* // / trx id .*// /.*index .* in // /trx table locks [0-9]* // /total table locks [0-9]* //
|
|
SHOW ENGINE InnoDB STATUS;
|
|
set @old_sql_mode = @@sql_mode;
|
|
set sql_mode = 'ANSI_QUOTES';
|
|
--replace_regex /.*RECORD LOCKS space id [0-9]* page no [0-9]* n bits [0-9]* // / trx id .*// /.*index .* in // /trx table locks [0-9]* // /total table locks [0-9]* //
|
|
SHOW ENGINE InnoDB STATUS;
|
|
SET GLOBAL innodb_deadlock_detect= @save_detect;
|
|
SET GLOBAL innodb_deadlock_report= @save_report;
|
|
set @@sql_mode = @old_sql_mode;
|
|
connection con1;
|
|
REAP;
|
|
ROLLBACK;
|
|
disconnect con1;
|
|
connection default;
|
|
DROP TABLE `t``\""e`;
|
|
--enable_view_protocol
|