diff options
Diffstat (limited to 'storage/xtradb/include/buf0buf.h')
| -rw-r--r-- | storage/xtradb/include/buf0buf.h | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/storage/xtradb/include/buf0buf.h b/storage/xtradb/include/buf0buf.h index 3179fb07031..b35ab9df338 100644 --- a/storage/xtradb/include/buf0buf.h +++ b/storage/xtradb/include/buf0buf.h @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2013, 2014, SkySQL Ab. All Rights Reserved. +Copyright (c) 2013, 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 @@ -97,9 +97,6 @@ extern buf_block_t* back_block1; /*!< first block, for --apply-log */ extern buf_block_t* back_block2; /*!< second block, for page reorganize */ #endif /* !UNIV_HOTBACKUP */ -/** Magic value to use instead of checksums when they are disabled */ -#define BUF_NO_CHECKSUM_MAGIC 0xDEADBEEFUL - /** @brief States of a control block @see buf_page_t @@ -431,7 +428,8 @@ buf_page_get_gen( BUF_GET_IF_IN_POOL_OR_WATCH */ const char* file, /*!< in: file name */ ulint line, /*!< in: line where called */ - mtr_t* mtr); /*!< in: mini-transaction */ + mtr_t* mtr, /*!< in: mini-transaction */ + dberr_t* err = NULL); /*!< out: error code */ /********************************************************************//** Initializes a page to the buffer buf_pool. The page is usually not read from a file even if it cannot be found in the buffer buf_pool. This is one @@ -1477,9 +1475,9 @@ UNIV_INTERN byte* buf_page_encrypt_before_write( /*==========================*/ - buf_page_t* page, /*!< in/out: buffer page to be flushed */ - const byte* frame, - ulint space_id); + buf_page_t* page, /*!< in/out: buffer page to be flushed */ + byte* frame, /*!< in: src frame */ + ulint space_id); /*!< in: space id */ /********************************************************************** The hook that is called after page is written to disk. @@ -1614,6 +1612,14 @@ struct buf_page_t{ operation needed. */ unsigned key_version; /*!< key version for this block */ + bool page_encrypted; /*!< page is page encrypted */ + bool page_compressed;/*!< page is page compressed */ + ulint stored_checksum;/*!< stored page checksum if page + encrypted */ + bool encrypted; /*!< page is still encrypted */ + ulint calculated_checksum; + /*!< calculated checksum if page + encrypted */ ulint real_size; /*!< Real size of the page Normal pages == UNIV_PAGE_SIZE |