summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThirunarayanan Balathandayuthapani <thiru@mariadb.com>2020-02-25 16:57:33 +0530
committerThirunarayanan Balathandayuthapani <thiru@mariadb.com>2020-03-03 15:15:23 +0530
commitf8c09efa93986e5adb3d67f911cafb06198a7403 (patch)
tree8d80d14dedc9e532212391282c7f86d13182048e
parent8cc94e1f467c151c1152776dfc1a893b5e62363e (diff)
downloadmariadb-git-f8c09efa93986e5adb3d67f911cafb06198a7403.tar.gz
MDEV-15528 Punch holes when pages are freed
- Addressed encryption suite failure
-rw-r--r--storage/innobase/fil/fil0crypt.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc
index 6b520305279..7c09a1ff5bb 100644
--- a/storage/innobase/fil/fil0crypt.cc
+++ b/storage/innobase/fil/fil0crypt.cc
@@ -1985,11 +1985,14 @@ static void fil_crypt_complete_rotate_space(rotate_thread_t* state)
crypt_data->rotate_state.flushing = true;
crypt_data->min_key_version =
crypt_data->rotate_state.min_key_version_found;
+ mutex_exit(&crypt_data->mutex);
fil_crypt_flush_space(state);
mutex_enter(&crypt_data->mutex);
crypt_data->rotate_state.flushing = false;
mutex_exit(&crypt_data->mutex);
+ } else {
+ mutex_exit(&crypt_data->mutex);
}
} else {
mutex_enter(&crypt_data->mutex);