summaryrefslogtreecommitdiff
path: root/storage/innobase
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@mariadb.com>2016-10-24 16:55:36 +0300
committerJan Lindström <jan.lindstrom@mariadb.com>2016-10-24 16:55:36 +0300
commit1bfa37a79c78998e11c79227089864358d05bb4c (patch)
tree3fe7b5bad16bc916df1d766f2dbac45549715c83 /storage/innobase
parentec5bd0d3855aa49afc3e356aa18b7edea3b7a18b (diff)
downloadmariadb-git-1bfa37a79c78998e11c79227089864358d05bb4c.tar.gz
Add more information if encryption information is already stored for
tablespace but page0 is not yet read.
Diffstat (limited to 'storage/innobase')
-rw-r--r--storage/innobase/fil/fil0fil.cc9
1 files changed, 8 insertions, 1 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);