After-merge fix

dr-m · dr-m · commit 977073e3dccd · 2018-12-18T12:38:38.000+02:00
diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc
@@ -2589,7 +2589,7 @@ fil_space_verify_crypt_checksum(const byte* page, const page_size_t& page_size)
 		if (checksum == BUF_NO_CHECKSUM_MAGIC) {
 			return true;
 		}
-		if (zip_size) {
+		if (page_size.is_compressed()) {
 			return checksum == page_zip_calc_checksum(
 				page, page_size.physical(),
 				SRV_CHECKSUM_ALGORITHM_CRC32)

Original file line number	Diff line number	Diff line change
`@@ -2589,7 +2589,7 @@ fil_space_verify_crypt_checksum(const byte* page, const page_size_t& page_size)`
`2589`	`2589`	`if (checksum == BUF_NO_CHECKSUM_MAGIC) {`
`2590`	`2590`	`return true;`
`2591`	`2591`	`}`
`2592`		`- if (zip_size) {`
	`2592`	`+ if (page_size.is_compressed()) {`
`2593`	`2593`	`return checksum == page_zip_calc_checksum(`
`2594`	`2594`	`page, page_size.physical(),`
`2595`	`2595`	`SRV_CHECKSUM_ALGORITHM_CRC32)`