diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-24 12:14:35 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-24 12:14:35 +0300 |
| commit | 88f38661b75e68ed255491ed51e52e73cfe06011 (patch) | |
| tree | b4ceb1f2eddb28c89a70251b77c328e944077b2e /storage/innobase/srv | |
| parent | 7e2b42324caf6faaaa5a3a033c2b24e1fee93669 (diff) | |
| parent | d5bd704f4be776df00e3f2e629936bb60d6b10a1 (diff) | |
| download | mariadb-git-88f38661b75e68ed255491ed51e52e73cfe06011.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/innobase/srv')
| -rw-r--r-- | storage/innobase/srv/srv0srv.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc index 685e4f19aa2..73e67c12d58 100644 --- a/storage/innobase/srv/srv0srv.cc +++ b/storage/innobase/srv/srv0srv.cc @@ -1948,7 +1948,9 @@ static uint32_t srv_do_purge(ulint* n_total_purged) n_pages_purged = trx_purge( n_use_threads, !(++count % srv_purge_rseg_truncate_frequency) - || purge_sys.truncate.current); + || purge_sys.truncate.current + || (srv_shutdown_state != SRV_SHUTDOWN_NONE + && srv_fast_shutdown == 0)); *n_total_purged += n_pages_purged; } while (n_pages_purged > 0 && !purge_sys.paused() |