mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-04-16 20:25:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions1

Add more information if encryption information is already stored for

Browse source 
tablespace but page0 is not yet read.
This commit is contained in:
Jan Lindström 2016-10-24 16:55:36 +03:00
parent ec5bd0d385
commit 1bfa37a79c
2 changed files with 16 additions and 2 deletions
storage
innobase/fil
fil0fil.cc
xtradb/fil
fil0fil.cc

9
storage/innobase/fil/fil0fil.cc
View file

@ -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);

9
storage/xtradb/fil/fil0fil.cc
View file

@ -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);