[Commits] 164edee7005: Add error printout to fil_space_verify_crypt_checksum for

jan jan.lindstrom at mariadb.com
Wed Aug 2 11:16:19 EEST 2017


revision-id: 164edee7005c4a0280d68e36c4a344061e7b0b80 (mariadb-10.1.25-15-g164edee7005)
parent(s): cbf84a806dfedc95bb5fbefd0a850f98b6dc2bd1
author: Jan Lindström
committer: Jan Lindström
timestamp: 2017-08-02 11:15:43 +0300
message:

Add error printout to fil_space_verify_crypt_checksum for
innochecksum.

---
 storage/innobase/fil/fil0crypt.cc | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc
index fe79d2eefc1..619407d9ad0 100644
--- a/storage/innobase/fil/fil0crypt.cc
+++ b/storage/innobase/fil/fil0crypt.cc
@@ -2676,13 +2676,25 @@ fil_space_verify_crypt_checksum(
 		corrupted. */
 #ifndef UNIV_INNOCHECKSUM
 		ib_logf(IB_LOG_LEVEL_ERROR,
-			" Page %lu in space %s (%lu) maybe corrupted."
-			" Post encryption checksum %u stored [%lu:%lu] key_version %u",
+			" Page " ULINTPF " in space %s (" ULINTPF ") maybe corrupted."
+			" Post encryption checksum %u stored [" ULINTPF ":" ULINTPF "] key_version %u",
 			pageno,
 			space ? space->name : "N/A",
 			mach_read_from_4(page + FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID),
 			checksum, checksum1, checksum2, key_version);
-#endif
+#else
+		if (log_file) {
+			fprintf(log_file,
+				"Page " ULINTPF ":" ULINTPF " may be corrupted."
+				" Post encryption checksum %u"
+				" stored [" ULINTPF ":" ULINTPF "] key_version %u\n",
+				pageno,
+				mach_read_from_4(page + FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID),
+				checksum, checksum1, checksum2,
+				key_version);
+		}
+#endif /* UNIV_INNOCHECKSUM */
+
 		encrypted = false;
 	}
 


More information about the commits mailing list