Commit 276e042d authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-21893: Assertion failure on upgrade with innodb_encrypt_log

recv_log_recover_10_4(): Add a missing bit pattern negation that
was forgotten when commit f8a9f906
(MDEV-12353) removed the support for crash-upgrading.
parent adb41176
...@@ -1503,8 +1503,7 @@ static dberr_t recv_log_recover_10_4() ...@@ -1503,8 +1503,7 @@ static dberr_t recv_log_recover_10_4()
} }
if (log_sys.log.is_encrypted() if (log_sys.log.is_encrypted()
&& !log_crypt(buf, lsn & (OS_FILE_LOG_BLOCK_SIZE - 1), && !log_crypt(buf, lsn & ~511, 512, LOG_DECRYPT)) {
OS_FILE_LOG_BLOCK_SIZE, LOG_DECRYPT)) {
return DB_ERROR; return DB_ERROR;
} }
......
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