diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-08-14 11:09:06 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-08-14 16:25:18 +0300 |
| commit | bfb6ea02321f963c2b5f5beb333283585d3d1be3 (patch) | |
| tree | 1de9aa594dbefd0ce33301ec00833b442e9658af /storage/innobase/pars | |
| parent | a80753594a37538a35df7c02ae80da624578dec4 (diff) | |
| download | mariadb-git-bfb6ea02321f963c2b5f5beb333283585d3d1be3.tar.gz | |
MDEV-8589: Non-default ENCRYPTION_KEY_ID is ignored upon reading a table
Analysis: Problem was that when a new tablespace is created a default
encryption info is also created and stored to the tablespace. Later a
new encryption information was created with correct key_id but that
does not affect on IV.
Fix: Push encryption mode and key_id to lower levels and create
correct encryption info when a new tablespace is created.
This fix does not contain test case because, currently incorrect
encryption key causes page corruption and a lot of error messages
to error log causing mtr to fail.
Diffstat (limited to 'storage/innobase/pars')
| -rw-r--r-- | storage/innobase/pars/pars0pars.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/innobase/pars/pars0pars.cc b/storage/innobase/pars/pars0pars.cc index c87e1f8e247..da08939d78a 100644 --- a/storage/innobase/pars/pars0pars.cc +++ b/storage/innobase/pars/pars0pars.cc @@ -2019,7 +2019,8 @@ pars_create_table( column = static_cast<sym_node_t*>(que_node_get_next(column)); } - node = tab_create_graph_create(table, pars_sym_tab_global->heap, true); + node = tab_create_graph_create(table, pars_sym_tab_global->heap, true, + FIL_SPACE_ENCRYPTION_DEFAULT, FIL_DEFAULT_ENCRYPTION_KEY); table_sym->resolved = TRUE; table_sym->token_type = SYM_TABLE; |