diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2016-12-30 08:21:20 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2016-12-30 08:53:54 +0200 |
| commit | 341c375d4bddf0e5c381954606ca18be3b8c55e0 (patch) | |
| tree | 00356c65c0af0da40049fe6c05989c2210061f54 /storage/innobase/fil | |
| parent | f2fe65106f731df48072a16eea3cda0a903d7fe5 (diff) | |
| parent | dc9f5dfcbb8efbc7c1f178313f945981b01d229b (diff) | |
| download | mariadb-git-341c375d4bddf0e5c381954606ca18be3b8c55e0.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/innobase/fil')
| -rw-r--r-- | storage/innobase/fil/fil0crypt.cc | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc index b7ba81daf05..fd1cc24c92a 100644 --- a/storage/innobase/fil/fil0crypt.cc +++ b/storage/innobase/fil/fil0crypt.cc @@ -41,14 +41,10 @@ Modified Jan Lindström jan.lindstrom@mariadb.com #include <my_crypt.h> /** Mutex for keys */ -UNIV_INTERN ib_mutex_t fil_crypt_key_mutex; +static ib_mutex_t fil_crypt_key_mutex; static bool fil_crypt_threads_inited = false; -#ifdef UNIV_PFS_MUTEX -UNIV_INTERN mysql_pfs_key_t fil_crypt_key_mutex_key; -#endif - /** Is encryption enabled/disabled */ UNIV_INTERN ulong srv_encrypt_tables = 0; @@ -62,20 +58,16 @@ static uint srv_n_fil_crypt_threads_started = 0; UNIV_INTERN uint srv_fil_crypt_rotate_key_age = 1; /** Event to signal FROM the key rotation threads. */ -UNIV_INTERN os_event_t fil_crypt_event; +static os_event_t fil_crypt_event; /** Event to signal TO the key rotation threads. */ -UNIV_INTERN os_event_t fil_crypt_threads_event; +static os_event_t fil_crypt_threads_event; /** Event for waking up threads throttle */ -UNIV_INTERN os_event_t fil_crypt_throttle_sleep_event; +static os_event_t fil_crypt_throttle_sleep_event; /** Mutex for key rotation threads */ -UNIV_INTERN ib_mutex_t fil_crypt_threads_mutex; - -#ifdef UNIV_PFS_MUTEX -UNIV_INTERN mysql_pfs_key_t fil_crypt_threads_mutex_key; -#endif +static ib_mutex_t fil_crypt_threads_mutex; /** Variable ensuring only 1 thread at time does initial conversion */ static bool fil_crypt_start_converting = false; |