Add more information if encryption information is already stored for

tablespace but page0 is not yet read.
9 years ago · 1bfa37a79c
2 changed files with 16 additions and 2 deletions
--- 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);
--- 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);