diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-12 10:53:08 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-12 10:53:08 +0300 |
| commit | 75dd7a048315affc0c5986b6e955965d46621c6a (patch) | |
| tree | c4e6be618eb5f9d264fedc1fb5d6a5303e67bc06 | |
| parent | 058d93d47af79e650dc6a7abc107a400d8598e45 (diff) | |
| download | mariadb-git-75dd7a048315affc0c5986b6e955965d46621c6a.tar.gz | |
MDEV-24434 Assertion trx->in_rw_trx_list... in trx_sys_any_active_transactions()
trx_sys_any_active_transactions(): Remove a bogus debug assertion.
In trx_commit_in_memory() and trx_erase_lists(), we will remove
the transaction from trx_sys->rw_trx_list and set the state to
TRX_STATE_COMMITTED_IN_MEMORY.
| -rw-r--r-- | storage/innobase/trx/trx0sys.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/storage/innobase/trx/trx0sys.cc b/storage/innobase/trx/trx0sys.cc index 8d00bd824a2..9138e9475bf 100644 --- a/storage/innobase/trx/trx0sys.cc +++ b/storage/innobase/trx/trx0sys.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, 2020, MariaDB Corporation. +Copyright (c) 2017, 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 @@ -997,11 +997,6 @@ trx_sys_any_active_transactions(void) /* This may count some ACTIVE transactions twice, both in rw_trx_list and mysql_trx_list. */ total_trx += trx->state == TRX_STATE_ACTIVE; - /* Any PREPARED or COMMITTED transactions must be - in rw_trx_list, so it suffices to count them there. */ - ut_ad(trx->in_rw_trx_list - || trx->state == TRX_STATE_NOT_STARTED - || trx->state == TRX_STATE_ACTIVE); trx_mutex_exit(trx); } |