diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-04-01 11:50:21 +0300 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-04-07 23:44:56 +0200 |
| commit | b4a4d82396dce58496a9d0741fec505452d753f6 (patch) | |
| tree | 2faf7221af0af4241997bfe97dc643d19e93adb2 /storage/innobase/srv/srv0srv.cc | |
| parent | 47c344b00fa6878e5d1ce4235f8016a1ec995967 (diff) | |
| download | mariadb-git-b4a4d82396dce58496a9d0741fec505452d753f6.tar.gz | |
InnoDB/XtraDB Encryption cleanup.
Step 1:
-- Remove page encryption from dictionary (per table
encryption will be handled by storing crypt_data to page 0)
-- Remove encryption/compression from os0file and all functions
before that (compression will be added to buf0buf.cc)
-- Use same CRYPT_SCHEME_1 for all encryption methods
-- Do some code cleanups to confort InnoDB coding style
Diffstat (limited to 'storage/innobase/srv/srv0srv.cc')
| -rw-r--r-- | storage/innobase/srv/srv0srv.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc index ee88c1f9e33..78954725001 100644 --- a/storage/innobase/srv/srv0srv.cc +++ b/storage/innobase/srv/srv0srv.cc @@ -74,9 +74,9 @@ Created 10/8/1995 Heikki Tuuri #include "mysql/plugin.h" #include "mysql/service_thd_wait.h" #include "fil0fil.h" +#include "fil0crypt.h" #include "fil0pagecompress.h" #include "btr0scrub.h" -#include "fil0pageencryption.h" #ifdef WITH_WSREP extern int wsrep_debug; @@ -524,7 +524,7 @@ second. */ static time_t srv_last_log_flush_time; /** Default encryption key used for page encryption */ -UNIV_INTERN uint srv_default_page_encryption_key = DEFAULT_ENCRYPTION_KEY; +UNIV_INTERN uint srv_default_page_encryption_key = FIL_DEFAULT_ENCRYPTION_KEY; /** Enable semaphore request instrumentation */ UNIV_INTERN my_bool srv_instrument_semaphores = FALSE; |