database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

MDEV-8310: Encryption bogus message still in 10.1.5

Browse Source 
Moved warning print to debug builds only because on production
these messages are unnecessary.
This commit is contained in:
Jan Lindström
2015-06-17 09:12:26 +03:00
parent 6a92fa4be5
commit b94eaff8d9
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/innobase/fil/fil0crypt.cc
View File

@@ -271,6 +271,7 @@ fil_space_read_crypt_data(
} }
if (memcmp(page + offset, CRYPT_MAGIC, MAGIC_SZ) != 0) { if (memcmp(page + offset, CRYPT_MAGIC, MAGIC_SZ) != 0) {
#ifdef UNIV_DEBUG
ib_logf(IB_LOG_LEVEL_WARN, ib_logf(IB_LOG_LEVEL_WARN,
"Found potentially bogus bytes on " "Found potentially bogus bytes on "
"page 0 offset %lu for space %lu : " "page 0 offset %lu for space %lu : "
@@ -283,6 +284,7 @@ fil_space_read_crypt_data(
page[offset + 3], page[offset + 3],
page[offset + 4], page[offset + 4],
page[offset + 5]); page[offset + 5]);
#endif
/* Create data is not stored. */ /* Create data is not stored. */
return NULL; return NULL;
} }

2
storage/xtradb/fil/fil0crypt.cc
View File

@@ -271,6 +271,7 @@ fil_space_read_crypt_data(
} }
if (memcmp(page + offset, CRYPT_MAGIC, MAGIC_SZ) != 0) { if (memcmp(page + offset, CRYPT_MAGIC, MAGIC_SZ) != 0) {
#ifdef UNIV_DEBUG
ib_logf(IB_LOG_LEVEL_WARN, ib_logf(IB_LOG_LEVEL_WARN,
"Found potentially bogus bytes on " "Found potentially bogus bytes on "
"page 0 offset %lu for space %lu : " "page 0 offset %lu for space %lu : "
@@ -283,6 +284,7 @@ fil_space_read_crypt_data(
page[offset + 3], page[offset + 3],
page[offset + 4], page[offset + 4],
page[offset + 5]); page[offset + 5]);
#endif
/* Crypt data is not stored. */ /* Crypt data is not stored. */
return NULL; return NULL;
} }