diff options
| author | Thirunarayanan Balathandayuthapani <thiru@mariadb.com> | 2019-02-05 15:45:01 +0530 |
|---|---|---|
| committer | Thirunarayanan Balathandayuthapani <thiru@mariadb.com> | 2019-02-05 15:45:01 +0530 |
| commit | 8178d96e253b4730c12b33e1cbfa73482ffa07ae (patch) | |
| tree | 6dd5cf7aa2ae13b47832512ce8fd3494e5e2f57c | |
| parent | 65811978ab6b80f90a91093c30d2967d8445325a (diff) | |
| download | mariadb-git-bb-10.2-MDEV-14398-branch.tar.gz | |
MDEV-14398 When innodb_encryption_rotate_key_age=0 is set, server won't encrypt tablespacesbb-10.2-MDEV-14398-branch
- Fixed mariabackup test case failure.
| -rw-r--r-- | storage/innobase/fil/fil0fil.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc index eb54a6f6e40..ad92220383b 100644 --- a/storage/innobase/fil/fil0fil.cc +++ b/storage/innobase/fil/fil0fil.cc @@ -1317,6 +1317,10 @@ static void fil_space_remove_from_unencrypted_list(fil_space_t* space) @param[in] space space to be removed. */ void fil_space_remove_from_encrypt_or_unencrypt_list(fil_space_t* space) { + if (srv_operation != SRV_OPERATION_NORMAL) { + return; + } + if (space->is_in_encrypted_list()) { fil_space_remove_from_encrypted_list(space); } else if (space->is_in_unencrypted_list()) { @@ -1367,6 +1371,10 @@ from the unencrypted or encrypted list if it is present. @param[in] space space to be added. */ void fil_space_add_to_encrypt_or_unencrypt_list(fil_space_t* space) { + if (srv_operation != SRV_OPERATION_NORMAL) { + return; + } + if (space->crypt_data == NULL || space->crypt_data->min_key_version == 0) { fil_space_add_unencrypted_list(space); |