diff options
| author | Eugene Kosov <claprix@yandex.ru> | 2021-11-01 23:51:58 +0600 |
|---|---|---|
| committer | Eugene Kosov <claprix@yandex.ru> | 2021-11-17 15:49:22 +0600 |
| commit | ed0a224b3d42423699d977c338e3da05fccafaf2 (patch) | |
| tree | e4d99482e862f9cafd3d3c90b2d325fc530b12cb /storage/innobase/include/fil0crypt.h | |
| parent | 8f24f5fee267706c0a5f475140a19a9304e224b4 (diff) | |
| download | mariadb-git-ed0a224b3d42423699d977c338e3da05fccafaf2.tar.gz | |
MDEV-26747 improve corruption check for encrypted tables on ALTER IMPORTbb-10.2-MDEV-26747-corruption-check
fil_space_decrypt(): change signature to return status via dberr_t only.
Also replace impossible condition with an assertion and prove it via
test cases.
Diffstat (limited to 'storage/innobase/include/fil0crypt.h')
| -rw-r--r-- | storage/innobase/include/fil0crypt.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/storage/innobase/include/fil0crypt.h b/storage/innobase/include/fil0crypt.h index af6c930659b..42b38c395d8 100644 --- a/storage/innobase/include/fil0crypt.h +++ b/storage/innobase/include/fil0crypt.h @@ -359,16 +359,14 @@ Decrypt a page. @param[in] tmp_frame Temporary buffer @param[in] page_size Page size @param[in,out] src_frame Page to decrypt -@param[out] err DB_SUCCESS or error -@return true if page decrypted, false if not.*/ +@return DB_SUCCESS or error */ UNIV_INTERN -bool +dberr_t fil_space_decrypt( fil_space_crypt_t* crypt_data, byte* tmp_frame, const page_size_t& page_size, - byte* src_frame, - dberr_t* err); + byte* src_frame); /****************************************************************** Decrypt a page |