Skip to content

M
MariaDB
Commit 7d7b92c1 authored by Jan Lindström's avatar Jan Lindström
Browse files
Options

Disable encryption info and first page read info for every tablespace 

on product builds.
parent 5d001d13
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 4 deletions
storage/innobase/fil/fil0fil.cc
View file @ 7d7b92c1
...@@ -1251,12 +1251,14 @@ fil_space_create( ...@@ -1251,12 +1251,14 @@ fil_space_create(
space->page_0_crypt_read = true; space->page_0_crypt_read = true;
} }
#ifdef UNIV_DEBUG
ib_logf(IB_LOG_LEVEL_INFO, ib_logf(IB_LOG_LEVEL_INFO,
"Created tablespace for space %lu name %s key_id %u encryption %d\n", "Created tablespace for space %lu name %s key_id %u encryption %d.",
space->id, space->id,
space->name, space->name,
space->crypt_data ? space->crypt_data->key_id : 0, space->crypt_data ? space->crypt_data->key_id : 0,
space->crypt_data ? space->crypt_data->encryption : 0); space->crypt_data ? space->crypt_data->encryption : 0);
#endif
rw_lock_create(fil_space_latch_key, &space->latch, SYNC_FSP); rw_lock_create(fil_space_latch_key, &space->latch, SYNC_FSP);
...@@ -7267,13 +7269,15 @@ fil_space_get_crypt_data( ...@@ -7267,13 +7269,15 @@ fil_space_get_crypt_data(
space->crypt_data = fil_space_read_crypt_data(space_id, page, offset); space->crypt_data = fil_space_read_crypt_data(space_id, page, offset);
ut_free(buf); ut_free(buf);
#ifdef UNIV_DEBUG
ib_logf(IB_LOG_LEVEL_INFO, ib_logf(IB_LOG_LEVEL_INFO,
"Read page 0 from tablespace for space %lu name %s key_id %u encryption %d handle %d\n", "Read page 0 from tablespace for space %lu name %s key_id %u encryption %d handle %d.",
space_id, space_id,
space->name, space->name,
space->crypt_data ? space->crypt_data->key_id : 0, space->crypt_data ? space->crypt_data->key_id : 0,
space->crypt_data ? space->crypt_data->encryption : 0, space->crypt_data ? space->crypt_data->encryption : 0,
node->handle); node->handle);
#endif
ut_a(space->id == space_id); ut_a(space->id == space_id);
......
storage/xtradb/fil/fil0fil.cc
View file @ 7d7b92c1
...@@ -1296,12 +1296,14 @@ fil_space_create( ...@@ -1296,12 +1296,14 @@ fil_space_create(
space->page_0_crypt_read = true; space->page_0_crypt_read = true;
} }
#ifdef UNIV_DEBUG
ib_logf(IB_LOG_LEVEL_INFO, ib_logf(IB_LOG_LEVEL_INFO,
"Created tablespace for space %lu name %s key_id %u encryption %d\n", "Created tablespace for space %lu name %s key_id %u encryption %d.",
space->id, space->id,
space->name, space->name,
space->crypt_data ? space->crypt_data->key_id : 0, space->crypt_data ? space->crypt_data->key_id : 0,
space->crypt_data ? space->crypt_data->encryption : 0); space->crypt_data ? space->crypt_data->encryption : 0);
#endif
UT_LIST_ADD_LAST(space_list, fil_system->space_list, space); UT_LIST_ADD_LAST(space_list, fil_system->space_list, space);
...@@ -7365,13 +7367,15 @@ fil_space_get_crypt_data( ...@@ -7365,13 +7367,15 @@ fil_space_get_crypt_data(
space->crypt_data = fil_space_read_crypt_data(space_id, page, offset); space->crypt_data = fil_space_read_crypt_data(space_id, page, offset);
ut_free(buf); ut_free(buf);
#ifdef UNIV_DEBUG
ib_logf(IB_LOG_LEVEL_INFO, ib_logf(IB_LOG_LEVEL_INFO,
"Read page 0 from tablespace for space %lu name %s key_id %u encryption %d handle %d\n", "Read page 0 from tablespace for space %lu name %s key_id %u encryption %d handle %d.",
space_id, space_id,
space->name, space->name,
space->crypt_data ? space->crypt_data->key_id : 0, space->crypt_data ? space->crypt_data->key_id : 0,
space->crypt_data ? space->crypt_data->encryption : 0, space->crypt_data ? space->crypt_data->encryption : 0,
node->handle); node->handle);
#endif
ut_a(space->id == space_id); ut_a(space->id == space_id);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7