Skip to content

M
MariaDB
Commit 977073e3 authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

After-merge fix

parent 00321709
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
storage/innobase/fil/fil0crypt.cc
View file @ 977073e3
...@@ -2589,7 +2589,7 @@ fil_space_verify_crypt_checksum(const byte* page, const page_size_t& page_size) ...@@ -2589,7 +2589,7 @@ fil_space_verify_crypt_checksum(const byte* page, const page_size_t& page_size)
if (checksum == BUF_NO_CHECKSUM_MAGIC) { if (checksum == BUF_NO_CHECKSUM_MAGIC) {
return true; return true;
} }
if (zip_size) { if (page_size.is_compressed()) {
return checksum == page_zip_calc_checksum( return checksum == page_zip_calc_checksum(
page, page_size.physical(), page, page_size.physical(),
SRV_CHECKSUM_ALGORITHM_CRC32) SRV_CHECKSUM_ALGORITHM_CRC32)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7