diff options
| author | Jan Lindström <jan.lindstrom@skysql.com> | 2015-01-09 12:30:59 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-10 10:21:18 +0100 |
| commit | e2e809860e8a1ad6a4d82859558cfd89409ac6d4 (patch) | |
| tree | 2b300109a168ec882f89aee88aa09bd588c0176d /storage/innobase/include/os0file.h | |
| parent | e109a662c77ec8f6db42c940d6c82c00d2f9f5d9 (diff) | |
| download | mariadb-git-e2e809860e8a1ad6a4d82859558cfd89409ac6d4.tar.gz | |
Pass down the information should we encrypt the page at os0file.cc
when page compression and google encryption is used.
Diffstat (limited to 'storage/innobase/include/os0file.h')
| -rw-r--r-- | storage/innobase/include/os0file.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/storage/innobase/include/os0file.h b/storage/innobase/include/os0file.h index e2d0cf26682..73daea32d72 100644 --- a/storage/innobase/include/os0file.h +++ b/storage/innobase/include/os0file.h @@ -2,7 +2,7 @@ Copyright (c) 1995, 2013, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2009, Percona Inc. -Copyright (c) 2013, SkySQL Ab. All Rights Reserved. +Copyright (c) 2013, 2015, MariaDB Corporation. Portions of this file contain modifications contributed and copyrighted by Percona Inc.. Those modifications are @@ -314,12 +314,12 @@ The wrapper functions have the prefix of "innodb_". */ # define os_aio(type, mode, name, file, buf, offset, \ n, message1, message2, write_size, \ page_compression, page_compression_level, \ - page_encryption, page_encryption_key, lsn) \ + page_encryption, page_encryption_key, lsn, encrypt) \ pfs_os_aio_func(type, mode, name, file, buf, offset, \ n, message1, message2, write_size, \ page_compression, page_compression_level, \ page_encryption, page_encryption_key, \ - lsn, __FILE__, __LINE__) + lsn, encrypt, __FILE__, __LINE__) # define os_file_read(file, buf, offset, n, compressed) \ @@ -363,11 +363,11 @@ to original un-instrumented file I/O APIs */ # define os_aio(type, mode, name, file, buf, offset, n, message1, \ message2, write_size, page_compression, page_compression_level, \ - page_encryption, page_encryption_key, lsn) \ + page_encryption, page_encryption_key, lsn, encrypt) \ os_aio_func(type, mode, name, file, buf, offset, n, \ message1, message2, write_size, \ page_compression, page_compression_level, \ - page_encryption, page_encryption_key, lsn) + page_encryption, page_encryption_key, lsn, encrypt) # define os_file_read(file, buf, offset, n, compressed) \ os_file_read_func(file, buf, offset, n, compressed) @@ -787,9 +787,10 @@ pfs_os_aio_func( level to be used */ ibool page_encryption, /*!< in: is page encryption used on this file space */ - ulint page_encryption_key, /*!< page encryption + ulint page_encryption_key, /*!< in: page encryption key to be used */ - lsn_t lsn, /* lsn of the newest modification */ + lsn_t lsn, /*!< in: lsn of the newest modification */ + bool encrypt_later, /*!< in: should we encrypt ? */ const char* src_file,/*!< in: file name where func invoked */ ulint src_line);/*!< in: line where the func invoked */ /*******************************************************************//** @@ -1170,9 +1171,10 @@ os_aio_func( level to be used */ ibool page_encryption, /*!< in: is page encryption used on this file space */ - ulint page_encryption_key, /*!< page encryption key + ulint page_encryption_key, /*!< in: page encryption key to be used */ - lsn_t lsn); /* lsn of the newest modification */ + lsn_t lsn, /*!< in: lsn of the newest modification */ + bool encrypt_later); /*!< in: should we encrypt ? */ /************************************************************************//** Wakes up all async i/o threads so that they know to exit themselves in shutdown. */ |