From 354bf2adffac5f9e7e2f3a1e8862e5ab56d07497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Thu, 5 Sep 2019 12:00:15 +0300 Subject: Simplify trx_state_eq() --- storage/innobase/include/trx0trx.ic | 7 +------ 1 file changed, 1 insertion(+), 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 -- cgit v1.2.1