diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-05 10:48:03 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-05 10:48:03 +0200 |
commit | 4e7b382d3132e6be0e597d19d6467a9f58b459a7 (patch) | |
tree | d4b3816306cfb922de1e593386ecbf38492922ed /storage/innobase/include/fil0crypt.h | |
parent | 348ccb6f038a6c108ab9b6a01bdc356cefecd3d4 (diff) | |
parent | 758af98ff7c47cc1fb5debdc138312fa389d528f (diff) | |
download | mariadb-git-4e7b382d3132e6be0e597d19d6467a9f58b459a7.tar.gz |
Merge 10.1 to 10.2
Most conflicts are related to the MDEV-11638 InnoDB shutdown refactoring.
Diffstat (limited to 'storage/innobase/include/fil0crypt.h')
-rw-r--r-- | storage/innobase/include/fil0crypt.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/storage/innobase/include/fil0crypt.h b/storage/innobase/include/fil0crypt.h index e854915b2ae..72dd6c0d9c9 100644 --- a/storage/innobase/include/fil0crypt.h +++ b/storage/innobase/include/fil0crypt.h @@ -1,6 +1,6 @@ /***************************************************************************** Copyright (C) 2013, 2015, Google Inc. All Rights Reserved. -Copyright (c) 2015, 2016, MariaDB Corporation. +Copyright (c) 2015, 2017, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -26,6 +26,8 @@ Created 04/01/2015 Jan Lindström #ifndef fil0crypt_h #define fil0crypt_h +#include "os0event.h" + /** * Magic pattern in start of crypt data on page 0 */ @@ -45,6 +47,8 @@ typedef enum { FIL_SPACE_ENCRYPTION_OFF = 2 /* Tablespace is not encrypted */ } fil_encryption_t; +extern os_event_t fil_crypt_threads_event; + /** * CRYPT_SCHEME_UNENCRYPTED * @@ -392,12 +396,6 @@ fil_crypt_set_thread_cnt( uint new_cnt); /*!< in: requested #threads */ /********************************************************************* -End threads for key rotation */ -UNIV_INTERN -void -fil_crypt_threads_end(); - -/********************************************************************* Cleanup resources for threads for key rotation */ UNIV_INTERN void |