Commit dd43c85c authored by Marko Mäkelä's avatar Marko Mäkelä

Merge 10.2 into 10.3

parents 94e22efb 23e4446a
...@@ -342,8 +342,8 @@ static bool page_is_corrupted(const byte *page, ulint page_no, ...@@ -342,8 +342,8 @@ static bool page_is_corrupted(const byte *page, ulint page_no,
bool decrypted = false; bool decrypted = false;
if (!space->crypt_data if (!space->crypt_data
|| space->crypt_data->type == CRYPT_SCHEME_UNENCRYPTED || space->crypt_data->type == CRYPT_SCHEME_UNENCRYPTED
|| fil_space_decrypt(space, tmp_frame, tmp_page, || !fil_space_decrypt(space, tmp_frame, tmp_page,
&decrypted)) { &decrypted)) {
return true; return true;
} }
......
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