diff options
Diffstat (limited to 'storage/innobase/include/trx0trx.ic')
| -rw-r--r-- | storage/innobase/include/trx0trx.ic | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/storage/innobase/include/trx0trx.ic b/storage/innobase/include/trx0trx.ic index f51d5368022..72310cbba06 100644 --- a/storage/innobase/include/trx0trx.ic +++ b/storage/innobase/include/trx0trx.ic @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2016, 2019, MariaDB Corporation. +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 @@ -49,11 +49,15 @@ trx_state_eq( case TRX_STATE_PREPARED: case TRX_STATE_PREPARED_RECOVERED: case TRX_STATE_COMMITTED_IN_MEMORY: - ut_ad(!trx_is_autocommit_non_locking(trx)); + ut_ad(!trx->is_autocommit_non_locking()); return(trx->state == state); case TRX_STATE_ACTIVE: - assert_trx_nonlocking_or_in_list(trx); + 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: |