summaryrefslogtreecommitdiff
path: root/storage/innobase/include/trx0trx.ic
diff options
context:
space:
mode:
Diffstat (limited to 'storage/innobase/include/trx0trx.ic')
-rw-r--r--storage/innobase/include/trx0trx.ic7
1 files changed, 1 insertions, 6 deletions
diff --git a/storage/innobase/include/trx0trx.ic b/storage/innobase/include/trx0trx.ic
index a5c95c788f1..f51d5368022 100644
--- a/storage/innobase/include/trx0trx.ic
+++ b/storage/innobase/include/trx0trx.ic
@@ -48,19 +48,14 @@ trx_state_eq(
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(trx));
return(trx->state == state);
case TRX_STATE_ACTIVE:
-
assert_trx_nonlocking_or_in_list(trx);
return(state == trx->state);
- case TRX_STATE_COMMITTED_IN_MEMORY:
-
- check_trx_state(trx);
- return(state == trx->state);
-
case TRX_STATE_NOT_STARTED:
/* These states are not allowed for running transactions. */
ut_a(state == TRX_STATE_NOT_STARTED