diff options
| author | Jan Lindström <jan.lindstrom@skysql.com> | 2014-12-29 21:55:20 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-10 10:21:17 +0100 |
| commit | 9cdf494197ae53fef5712ab9cbdecbed98462f1f (patch) | |
| tree | 3725e0e866586f6875f4229c9a33fdb7790f6a58 /storage/xtradb/buf/buf0flu.cc | |
| parent | d7d589dc01f6d70d1518b74d46fd3b75e76267f5 (diff) | |
| download | mariadb-git-9cdf494197ae53fef5712ab9cbdecbed98462f1f.tar.gz | |
Fixed XtraDB implementation of encryption and page encryption.
Diffstat (limited to 'storage/xtradb/buf/buf0flu.cc')
| -rw-r--r-- | storage/xtradb/buf/buf0flu.cc | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/storage/xtradb/buf/buf0flu.cc b/storage/xtradb/buf/buf0flu.cc index 571aaa2151c..c7356015788 100644 --- a/storage/xtradb/buf/buf0flu.cc +++ b/storage/xtradb/buf/buf0flu.cc @@ -955,10 +955,16 @@ buf_flush_write_block_low( if (!srv_use_doublewrite_buf || !buf_dblwr) { fil_io(OS_FILE_WRITE | OS_AIO_SIMULATED_WAKE_LATER, - sync, buf_page_get_space(bpage), zip_size, - buf_page_get_page_no(bpage), 0, + sync, + buf_page_get_space(bpage), + zip_size, + buf_page_get_page_no(bpage), + 0, zip_size ? zip_size : UNIV_PAGE_SIZE, - frame, bpage, &bpage->write_size); + frame, + bpage, + &bpage->write_size, + bpage->newest_modification); } else { /* InnoDB uses doublewrite buffer and doublewrite buffer is initialized. User can define do we use atomic writes @@ -969,10 +975,16 @@ buf_flush_write_block_low( if (awrites == ATOMIC_WRITES_ON) { fil_io(OS_FILE_WRITE | OS_AIO_SIMULATED_WAKE_LATER, - FALSE, buf_page_get_space(bpage), zip_size, - buf_page_get_page_no(bpage), 0, - zip_size ? zip_size : UNIV_PAGE_SIZE, - frame, bpage, &bpage->write_size); + FALSE, + buf_page_get_space(bpage), + zip_size, + buf_page_get_page_no(bpage), + 0, + zip_size ? zip_size : UNIV_PAGE_SIZE, + frame, + bpage, + &bpage->write_size, + bpage->newest_modification); } else if (flush_type == BUF_FLUSH_SINGLE_PAGE) { buf_dblwr_write_single_page(bpage, sync); } else { |