From ed0a224b3d42423699d977c338e3da05fccafaf2 Mon Sep 17 00:00:00 2001 From: Eugene Kosov Date: Mon, 1 Nov 2021 23:51:58 +0600 Subject: MDEV-26747 improve corruption check for encrypted tables on ALTER IMPORT 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. --- storage/innobase/include/fil0crypt.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'storage/innobase/include/fil0crypt.h') 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 -- cgit v1.2.1