diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-05 12:00:15 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-05 14:13:17 +0300 |
| commit | 354bf2adffac5f9e7e2f3a1e8862e5ab56d07497 (patch) | |
| tree | 7b377070f17d4a68271a06e4c6cda563d9e50eab | |
| parent | d721643d0e568f866a550f4cf9bc4e84ed7150ef (diff) | |
| download | mariadb-git-354bf2adffac5f9e7e2f3a1e8862e5ab56d07497.tar.gz | |
Simplify trx_state_eq()10.3-marko
| -rw-r--r-- | storage/innobase/include/trx0trx.ic | 7 |
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 |