diff options
Diffstat (limited to 'storage/innobase/include/os0file.h')
| -rw-r--r-- | storage/innobase/include/os0file.h | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/storage/innobase/include/os0file.h b/storage/innobase/include/os0file.h index 8f8aef4f45c..e2d0cf26682 100644 --- a/storage/innobase/include/os0file.h +++ b/storage/innobase/include/os0file.h @@ -313,10 +313,14 @@ 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_compression, page_compression_level, \ + page_encryption, page_encryption_key, lsn) \ pfs_os_aio_func(type, mode, name, file, buf, offset, \ n, message1, message2, write_size, \ - page_compression, page_compression_level, __FILE__, __LINE__) + page_compression, page_compression_level, \ + page_encryption, page_encryption_key, \ + lsn, __FILE__, __LINE__) + # define os_file_read(file, buf, offset, n, compressed) \ pfs_os_file_read_func(file, buf, offset, n, compressed, __FILE__, __LINE__) @@ -357,9 +361,13 @@ to original un-instrumented file I/O APIs */ # define os_file_close(file) os_file_close_func(file) -# define os_aio(type, mode, name, file, buf, offset, n, message1, message2, write_size, page_compression, page_compression_level) \ +# 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) \ os_aio_func(type, mode, name, file, buf, offset, n, \ - message1, message2, write_size, page_compression, page_compression_level) + message1, message2, write_size, \ + page_compression, page_compression_level, \ + page_encryption, page_encryption_key, lsn) # define os_file_read(file, buf, offset, n, compressed) \ os_file_read_func(file, buf, offset, n, compressed) @@ -777,6 +785,11 @@ pfs_os_aio_func( on this file space */ ulint page_compression_level, /*!< page compression level to be used */ + ibool page_encryption, /*!< in: is page encryption used + on this file space */ + ulint page_encryption_key, /*!< page encryption + key to be used */ + lsn_t lsn, /* lsn of the newest modification */ const char* src_file,/*!< in: file name where func invoked */ ulint src_line);/*!< in: line where the func invoked */ /*******************************************************************//** @@ -1153,9 +1166,13 @@ os_aio_func( actual page size does not decrease. */ ibool page_compression, /*!< in: is page compression used on this file space */ - ulint page_compression_level); /*!< page compression + ulint page_compression_level, /*!< page compression level to be used */ - + ibool page_encryption, /*!< in: is page encryption used + on this file space */ + ulint page_encryption_key, /*!< page encryption key + to be used */ + lsn_t lsn); /* lsn of the newest modification */ /************************************************************************//** Wakes up all async i/o threads so that they know to exit themselves in shutdown. */ |