From b94eaff8d90a60b9dea3b5b68fbde3d35563127b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Wed, 17 Jun 2015 09:12:26 +0300 Subject: [PATCH] MDEV-8310: Encryption bogus message still in 10.1.5 Moved warning print to debug builds only because on production these messages are unnecessary. --- storage/innobase/fil/fil0crypt.cc | 2 ++ storage/xtradb/fil/fil0crypt.cc | 2 ++ 2 files changed, 4 insertions(+) diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc index a4744225b48..1cf6c0401bb 100644 --- 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 index dabd94ca94c..ff957cd4ac9 100644 --- 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; }