MDEV-8310: Encryption bogus message still in 10.1.5

Jan Lindström · Jan Lindström · commit b94eaff8d90a · 2015-06-17T09:12:26.000+03:00
Moved warning print to debug builds only because on production
these messages are unnecessary.
diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc
@@ -271,6 +271,7 @@ fil_space_read_crypt_data(
 	}
 
 	if (memcmp(page + offset, CRYPT_MAGIC, MAGIC_SZ) != 0) {
+#ifdef UNIV_DEBUG
 		ib_logf(IB_LOG_LEVEL_WARN,
 			"Found potentially bogus bytes on "
 			"page 0 offset %lu for space %lu : "
@@ -283,6 +284,7 @@ fil_space_read_crypt_data(
 			page[offset + 3],
 			page[offset + 4],
 			page[offset + 5]);
+#endif
 		/* Create data is not stored. */
 		return NULL;
 	}
diff --git a/storage/xtradb/fil/fil0crypt.cc b/storage/xtradb/fil/fil0crypt.cc
@@ -271,6 +271,7 @@ fil_space_read_crypt_data(
 	}
 
 	if (memcmp(page + offset, CRYPT_MAGIC, MAGIC_SZ) != 0) {
+#ifdef UNIV_DEBUG
 		ib_logf(IB_LOG_LEVEL_WARN,
 			"Found potentially bogus bytes on "
 			"page 0 offset %lu for space %lu : "
@@ -283,6 +284,7 @@ fil_space_read_crypt_data(
 			page[offset + 3],
 			page[offset + 4],
 			page[offset + 5]);
+#endif
 		/* Crypt data is not stored. */
 		return NULL;
 	}

Original file line number	Diff line number	Diff line change
`@@ -271,6 +271,7 @@ fil_space_read_crypt_data(`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`if (memcmp(page + offset, CRYPT_MAGIC, MAGIC_SZ) != 0) {`
	`274`	`+#ifdef UNIV_DEBUG`
`274`	`275`	`ib_logf(IB_LOG_LEVEL_WARN,`
`275`	`276`	`"Found potentially bogus bytes on "`
`276`	`277`	`"page 0 offset %lu for space %lu : "`
`@@ -283,6 +284,7 @@ fil_space_read_crypt_data(`
`283`	`284`	`page[offset + 3],`
`284`	`285`	`page[offset + 4],`
`285`	`286`	`page[offset + 5]);`
	`287`	`+#endif`
`286`	`288`	`/* Create data is not stored. */`
`287`	`289`	`return NULL;`
`288`	`290`	`}`