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 f8a9f90 (MDEV-12353) removed the support for crash-upgrading.
MariaDB · Mar 9, 2020 · 276e042 · 276e042
1 parent adb4117
commit 276e042
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc
@@ -1503,8 +1503,7 @@ static dberr_t recv_log_recover_10_4()
 	}
 
 	if (log_sys.log.is_encrypted()
-	    && !log_crypt(buf, lsn & (OS_FILE_LOG_BLOCK_SIZE - 1),
-			  OS_FILE_LOG_BLOCK_SIZE, LOG_DECRYPT)) {
+	    && !log_crypt(buf, lsn & ~511, 512, LOG_DECRYPT)) {
 		return DB_ERROR;
 	}