diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-09-04 15:54:20 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-09-08 08:38:12 +0300 |
| commit | 509b836623852f461febea737dc7e32603d50344 (patch) | |
| tree | 56177565a8e08bccdd326c5d1cd7f6df9dc83a24 /storage/xtradb/include/row0ftsort.h | |
| parent | 42574427e67ac646b19f41b35563b9c1679eea77 (diff) | |
| download | mariadb-git-509b836623852f461febea737dc7e32603d50344.tar.gz | |
MDEV-8708: InnoDB temp file encryption
Added encryption support for online alter table where InnoDB temporary
files are used. Added similar support also for tables containing
full text-indexes.
Made sure that table remains encrypted during discard and import
tablespace.
Diffstat (limited to 'storage/xtradb/include/row0ftsort.h')
| -rw-r--r-- | storage/xtradb/include/row0ftsort.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/storage/xtradb/include/row0ftsort.h b/storage/xtradb/include/row0ftsort.h index 4e04a099140..eeef10f3397 100644 --- a/storage/xtradb/include/row0ftsort.h +++ b/storage/xtradb/include/row0ftsort.h @@ -1,6 +1,7 @@ /***************************************************************************** Copyright (c) 2010, 2012, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2015, 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 @@ -71,6 +72,7 @@ struct fts_psort_common_t { store Doc ID during sort, if Doc ID will not be big enough to use 8 bytes value */ + fil_space_crypt_t* crypt_data; /*!< crypt data or NULL */ }; struct fts_psort_t { @@ -83,6 +85,10 @@ struct fts_psort_t { /*!< buffer to write to file */ row_merge_block_t* block_alloc[FTS_NUM_AUX_INDEX]; /*!< buffer to allocated */ + row_merge_block_t* crypt_block[FTS_NUM_AUX_INDEX]; + /*!< buffer to crypt data */ + row_merge_block_t* crypt_alloc[FTS_NUM_AUX_INDEX]; + /*!< buffer to allocated */ ulint child_status; /*!< child thread status */ ulint state; /*!< parent thread state */ fts_doc_list_t fts_doc_list; /*!< doc list to process */ |