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/row/row0log.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/row/row0log.cc')
| -rw-r--r-- | storage/innobase/row/row0log.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/row/row0log.cc b/storage/innobase/row/row0log.cc index caed087b439..c63dbffcba9 100644 --- a/storage/innobase/row/row0log.cc +++ b/storage/innobase/row/row0log.cc @@ -2554,7 +2554,7 @@ all_done: success = os_file_read_no_error_handling( OS_FILE_FROM_FD(index->online_log->fd), index->online_log->head.block, ofs, - srv_sort_buf_size, FALSE); + srv_sort_buf_size); if (!success) { fprintf(stderr, "InnoDB: unable to read temporary file" @@ -3385,7 +3385,7 @@ all_done: success = os_file_read_no_error_handling( OS_FILE_FROM_FD(index->online_log->fd), index->online_log->head.block, ofs, - srv_sort_buf_size, FALSE); + srv_sort_buf_size); if (!success) { fprintf(stderr, "InnoDB: unable to read temporary file" |