diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-04-01 11:50:21 +0300 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-04-07 23:44:56 +0200 |
| commit | b4a4d82396dce58496a9d0741fec505452d753f6 (patch) | |
| tree | 2faf7221af0af4241997bfe97dc643d19e93adb2 /storage/innobase/buf/buf0flu.cc | |
| parent | 47c344b00fa6878e5d1ce4235f8016a1ec995967 (diff) | |
| download | mariadb-git-b4a4d82396dce58496a9d0741fec505452d753f6.tar.gz | |
InnoDB/XtraDB Encryption cleanup.
Step 1:
-- Remove page encryption from dictionary (per table
encryption will be handled by storing crypt_data to page 0)
-- Remove encryption/compression from os0file and all functions
before that (compression will be added to buf0buf.cc)
-- Use same CRYPT_SCHEME_1 for all encryption methods
-- Do some code cleanups to confort InnoDB coding style
Diffstat (limited to 'storage/innobase/buf/buf0flu.cc')
| -rw-r--r-- | storage/innobase/buf/buf0flu.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/storage/innobase/buf/buf0flu.cc b/storage/innobase/buf/buf0flu.cc index 9bd7a7c007d..b8a34558867 100644 --- a/storage/innobase/buf/buf0flu.cc +++ b/storage/innobase/buf/buf0flu.cc @@ -921,9 +921,7 @@ buf_flush_write_block_low( zip_size ? zip_size : UNIV_PAGE_SIZE, frame, bpage, - &bpage->write_size, - bpage->newest_modification, - bpage->encrypt_later); + &bpage->write_size); } else { /* InnoDB uses doublewrite buffer and doublewrite buffer @@ -943,9 +941,7 @@ buf_flush_write_block_low( zip_size ? zip_size : UNIV_PAGE_SIZE, frame, bpage, - &bpage->write_size, - bpage->newest_modification, - bpage->encrypt_later); + &bpage->write_size); } else if (flush_type == BUF_FLUSH_SINGLE_PAGE) { buf_dblwr_write_single_page(bpage, sync); } else { |