From 1bfa37a79c78998e11c79227089864358d05bb4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Mon, 24 Oct 2016 16:55:36 +0300 Subject: [PATCH] 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 f1fdb0f281e..a88cf6e65bd 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 93df92e6e63..440b95daa18 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);