diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-05 16:51:26 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-05 16:51:26 +0300 |
| commit | 680463a8d991389f4ea5942e87764137c55c0eb4 (patch) | |
| tree | 427f8946aa9085c7f6346e1047144995cb7c459e /storage/innobase/row/row0purge.cc | |
| parent | 05693cf2149f8792863a32325090e789015286fc (diff) | |
| parent | efc70da5fd0459ff44153529d13651741cc32bc4 (diff) | |
| download | mariadb-git-680463a8d991389f4ea5942e87764137c55c0eb4.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/row/row0purge.cc')
| -rw-r--r-- | storage/innobase/row/row0purge.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/row/row0purge.cc b/storage/innobase/row/row0purge.cc index 56253b73006..d299f948d7c 100644 --- a/storage/innobase/row/row0purge.cc +++ b/storage/innobase/row/row0purge.cc @@ -1094,7 +1094,7 @@ try_again: dict_table_close(node->table, FALSE, FALSE); rw_lock_s_unlock(&dict_operation_lock); - if (srv_shutdown_state != SRV_SHUTDOWN_NONE) { + if (srv_shutdown_state > SRV_SHUTDOWN_INITIATED) { return(false); } os_thread_sleep(1000000); @@ -1264,7 +1264,7 @@ row_purge( ut_ad(!rw_lock_own(&dict_operation_lock, RW_LOCK_S)); if (purged - || srv_shutdown_state != SRV_SHUTDOWN_NONE + || srv_shutdown_state > SRV_SHUTDOWN_INITIATED || node->vcol_op_failed()) { return; } |