diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-13 14:45:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-13 14:45:52 +0300 |
| commit | b68f1d847f1fc00eed795e20162effc8fbc4119b (patch) | |
| tree | 3bafa1ea02b2fb3b29738e8f108fa34c1d3805da /storage | |
| parent | 2fd2fd77e70ed78fe8f9fc7cf99f2ebf5c2a1eef (diff) | |
| download | mariadb-git-b68f1d847f1fc00eed795e20162effc8fbc4119b.tar.gz | |
MDEV-21217 innodb_force_recovery=2 may wrongly abort rollback
trx_roll_must_shutdown(): Correct the condition that detects
the start of shutdown.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/trx/trx0roll.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/trx/trx0roll.cc b/storage/innobase/trx/trx0roll.cc index 9c63c68f84f..127cfc9b07d 100644 --- a/storage/innobase/trx/trx0roll.cc +++ b/storage/innobase/trx/trx0roll.cc @@ -750,7 +750,7 @@ trx_roll_must_shutdown() ut_ad(trx_state_eq(trx, TRX_STATE_ACTIVE)); if (trx_get_dict_operation(trx) == TRX_DICT_OP_NONE - && !srv_is_being_started + && srv_shutdown_state != SRV_SHUTDOWN_NONE && !srv_undo_sources && srv_fast_shutdown) { return true; } |