mirror of
https://github.com/MariaDB/server.git
synced 2025-02-10 07:34: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
88 lines
2.7 KiB
C++
88 lines
2.7 KiB
C++
/*****************************************************************************
|
|
|
|
Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
|
|
Copyright (c) 2016, 2021, MariaDB Corporation.
|
|
|
|
This program is free software; you can redistribute it and/or modify it under
|
|
the terms of the GNU General Public License as published by the Free Software
|
|
Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful, but WITHOUT
|
|
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License along with
|
|
this program; if not, write to the Free Software Foundation, Inc.,
|
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
|
|
|
|
*****************************************************************************/
|
|
|
|
/**************************************************//**
|
|
@file include/trx0trx.ic
|
|
The transaction
|
|
|
|
Created 3/26/1996 Heikki Tuuri
|
|
*******************************************************/
|
|
|
|
/**********************************************************************//**
|
|
Determines if a transaction is in the given state.
|
|
The caller must hold trx->mutex, or it must be the thread
|
|
that is serving a running transaction.
|
|
A running RW transaction must be in trx_sys.rw_trx_hash.
|
|
@return TRUE if trx->state == state */
|
|
UNIV_INLINE
|
|
bool
|
|
trx_state_eq(
|
|
/*=========*/
|
|
const trx_t* trx, /*!< in: transaction */
|
|
trx_state_t state, /*!< in: state;
|
|
if state != TRX_STATE_NOT_STARTED
|
|
asserts that
|
|
trx->state != TRX_STATE_NOT_STARTED */
|
|
bool relaxed)
|
|
/*!< in: whether to allow
|
|
trx->state == TRX_STATE_NOT_STARTED
|
|
after an error has been reported */
|
|
{
|
|
#ifdef UNIV_DEBUG
|
|
switch (trx->state) {
|
|
case TRX_STATE_PREPARED:
|
|
case TRX_STATE_PREPARED_RECOVERED:
|
|
case TRX_STATE_COMMITTED_IN_MEMORY:
|
|
ut_ad(!trx->is_autocommit_non_locking());
|
|
return(trx->state == state);
|
|
|
|
case TRX_STATE_ACTIVE:
|
|
if (trx->is_autocommit_non_locking()) {
|
|
ut_ad(!trx->is_recovered);
|
|
ut_ad(trx->read_only);
|
|
ut_ad(trx->mysql_thd);
|
|
}
|
|
return(state == trx->state);
|
|
|
|
case TRX_STATE_NOT_STARTED:
|
|
/* These states are not allowed for running transactions. */
|
|
ut_a(state == TRX_STATE_NOT_STARTED
|
|
|| (relaxed
|
|
&& thd_get_error_number(trx->mysql_thd)));
|
|
|
|
return(true);
|
|
case TRX_STATE_ABORTED:
|
|
break;
|
|
}
|
|
ut_error;
|
|
#endif /* UNIV_DEBUG */
|
|
return(trx->state == state);
|
|
}
|
|
|
|
/****************************************************************//**
|
|
Retrieves the error_info field from a trx.
|
|
@return the error info */
|
|
UNIV_INLINE
|
|
const dict_index_t*
|
|
trx_get_error_info(
|
|
/*===============*/
|
|
const trx_t* trx) /*!< in: trx object */
|
|
{
|
|
return(trx->error_info);
|
|
}
|