[Commits] 1bfa37a: Add more information if encryption information is already stored for

Jan Lindström jan.lindstrom at mariadb.com
Mon Oct 24 16:56:06 EEST 2016


revision-id: 1bfa37a79c78998e11c79227089864358d05bb4c (mariadb-10.1.18-12-g1bfa37a)
parent(s): ec5bd0d3855aa49afc3e356aa18b7edea3b7a18b
author: Jan Lindström
committer: Jan Lindström
timestamp: 2016-10-24 16:55:36 +0300
message:

Add more information if encryption information is already stored for
tablespace but page0 is not yet read.

---
 storage/innobase/fil/fil0fil.cc | 9 ++++++++-
 storage/xtradb/fil/fil0fil.cc   | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc
index f1fdb0f..a88cf6e 100644
--- a/storage/innobase/fil/fil0fil.cc
+++ b/storage/innobase/fil/fil0fil.cc
@@ -7286,7 +7286,14 @@ fil_space_get_crypt_data(
 
 		crypt_data = space->crypt_data;
 
-		ut_ad(space->page_0_crypt_read);
+		if (!space->page_0_crypt_read) {
+			ib_logf(IB_LOG_LEVEL_WARN,
+				"Space %lu name %s contains encryption %d information for key_id %d but page0 is not read.",
+				space->id,
+				space->name,
+				space->crypt_data ? space->crypt_data->encryption : 0,
+				space->crypt_data ? space->crypt_data->key_id : 0);
+		}
 	}
 
 	return(crypt_data);
diff --git a/storage/xtradb/fil/fil0fil.cc b/storage/xtradb/fil/fil0fil.cc
index 93df92e..440b95d 100644
--- a/storage/xtradb/fil/fil0fil.cc
+++ b/storage/xtradb/fil/fil0fil.cc
@@ -7390,7 +7390,14 @@ fil_space_get_crypt_data(
 
 		crypt_data = space->crypt_data;
 
-		ut_ad(space->page_0_crypt_read);
+		if (!space->page_0_crypt_read) {
+			ib_logf(IB_LOG_LEVEL_WARN,
+				"Space %lu name %s contains encryption %d information for key_id %d but page0 is not read.",
+				space->id,
+				space->name,
+				space->crypt_data ? space->crypt_data->encryption : 0,
+				space->crypt_data ? space->crypt_data->key_id : 0);
+		}
 	}
 
 	return(crypt_data);


More information about the commits mailing list