Skip to content

Commit 67e2252

Browse files
committed
Simplify trx_state_eq()
1 parent 2c9e75c commit 67e2252

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

storage/innobase/include/trx0trx.ic

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,14 @@ trx_state_eq(
4848
switch (trx->state) {
4949
case TRX_STATE_PREPARED:
5050
case TRX_STATE_PREPARED_RECOVERED:
51+
case TRX_STATE_COMMITTED_IN_MEMORY:
5152
ut_ad(!trx_is_autocommit_non_locking(trx));
5253
return(trx->state == state);
5354

5455
case TRX_STATE_ACTIVE:
55-
5656
assert_trx_nonlocking_or_in_list(trx);
5757
return(state == trx->state);
5858

59-
case TRX_STATE_COMMITTED_IN_MEMORY:
60-
61-
check_trx_state(trx);
62-
return(state == trx->state);
63-
6459
case TRX_STATE_NOT_STARTED:
6560
/* These states are not allowed for running transactions. */
6661
ut_a(state == TRX_STATE_NOT_STARTED

0 commit comments

Comments
 (0)