diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-21 17:42:02 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-21 17:42:02 +0300 |
| commit | 952a028a52f6e1b7067efa25b1a7d57721a8f3f6 (patch) | |
| tree | 7d3c3b3cff2e8f7efd280f3bf95064a352fa1783 /storage/innobase/fil/fil0crypt.cc | |
| parent | 3a423088ac4f854448803d8af14e0d176b08f0af (diff) | |
| parent | 2cf489d4305227115177b435ec536fe8f84daa6b (diff) | |
| download | mariadb-git-952a028a52f6e1b7067efa25b1a7d57721a8f3f6.tar.gz | |
Merge 10.3 into 10.4
We omit commit a3bdce8f1e268e3ac57644faf91c9c5ad43f5291
and commit a0e2a293bcc25fb10888fd00bd63bce04c195524
because they would make the test galera_3nodes.galera_gtid_2_cluster
fail and disable it.
Diffstat (limited to 'storage/innobase/fil/fil0crypt.cc')
| -rw-r--r-- | storage/innobase/fil/fil0crypt.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc index 540eea79b3c..225561917a8 100644 --- a/storage/innobase/fil/fil0crypt.cc +++ b/storage/innobase/fil/fil0crypt.cc @@ -1684,6 +1684,11 @@ static bool fil_crypt_find_space_to_rotate( { /* we need iops to start rotating */ while (!state->should_shutdown() && !fil_crypt_alloc_iops(state)) { + if (state->space && state->space->is_stopping()) { + state->space->release(); + state->space = NULL; + } + os_event_reset(fil_crypt_threads_event); os_event_wait_time(fil_crypt_threads_event, 100000); } @@ -2699,6 +2704,7 @@ fil_space_crypt_close_tablespace( /* wakeup throttle (all) sleepers */ os_event_set(fil_crypt_throttle_sleep_event); + os_event_set(fil_crypt_threads_event); os_thread_sleep(20000); dict_mutex_enter_for_mysql(); |