diff options
| author | Thirunarayanan Balathandayuthapani <thiru@mariadb.com> | 2019-10-03 18:12:08 +0530 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-09 13:13:12 +0300 |
| commit | c65cb244b35412ef54192b17120f7ace8a8af5fd (patch) | |
| tree | 1e1e7fa393ca63cc7a128a6f82d79209c2361ea4 /storage/innobase/include | |
| parent | 24232ec12cb6e6d68cd2517389e37842011b6718 (diff) | |
| download | mariadb-git-c65cb244b35412ef54192b17120f7ace8a8af5fd.tar.gz | |
MDEV-19335 Remove buf_page_t::encrypted
The field buf_page_t::encrypted was added in MDEV-8588.
It was made mostly redundant in MDEV-12699. Remove the field.
Diffstat (limited to 'storage/innobase/include')
| -rw-r--r-- | storage/innobase/include/buf0buf.h | 2 | ||||
| -rw-r--r-- | storage/innobase/include/fil0crypt.h | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h index 6bfeeb83018..af2a7d90101 100644 --- a/storage/innobase/include/buf0buf.h +++ b/storage/innobase/include/buf0buf.h @@ -1468,8 +1468,6 @@ public: if written again we check is TRIM operation needed. */ - bool encrypted; /*!< page is still encrypted */ - ulint real_size; /*!< Real size of the page Normal pages == UNIV_PAGE_SIZE page compressed pages, payload diff --git a/storage/innobase/include/fil0crypt.h b/storage/innobase/include/fil0crypt.h index 24108f95167..3c56315ee9a 100644 --- a/storage/innobase/include/fil0crypt.h +++ b/storage/innobase/include/fil0crypt.h @@ -375,7 +375,6 @@ Decrypt a page @param[in] space Tablespace @param[in] tmp_frame Temporary buffer used for decrypting @param[in,out] src_frame Page to decrypt -@param[out] decrypted true if page was decrypted @return decrypted page, or original not encrypted page if decryption is not needed.*/ UNIV_INTERN @@ -383,8 +382,7 @@ byte* fil_space_decrypt( const fil_space_t* space, byte* tmp_frame, - byte* src_frame, - bool* decrypted) + byte* src_frame) MY_ATTRIBUTE((warn_unused_result)); /****************************************************************** |