summaryrefslogtreecommitdiff
path: root/storage/innobase/include/buf0buf.h
diff options
context:
space:
mode:
Diffstat (limited to 'storage/innobase/include/buf0buf.h')
-rw-r--r--storage/innobase/include/buf0buf.h13
1 files changed, 11 insertions, 2 deletions
diff --git a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
index 647cc3d4274..70270edc95c 100644
--- a/storage/innobase/include/buf0buf.h
+++ b/storage/innobase/include/buf0buf.h
@@ -137,7 +137,7 @@ enum buf_page_state {
will be used to print table IO stats */
struct buf_pool_info_t{
/* General buffer pool info */
- ulint pool_unique_id; /*!< Buffer Pool ID */
+ uint pool_unique_id; /*!< Buffer Pool ID */
ulint pool_size; /*!< Buffer Pool size in pages */
ulint lru_len; /*!< Length of buf_pool->LRU */
ulint old_lru_len; /*!< buf_pool->LRU_old_len */
@@ -828,7 +828,7 @@ void
buf_stats_get_pool_info(
/*====================*/
buf_pool_t* buf_pool, /*!< in: buffer pool */
- ulint pool_id, /*!< in: buffer pool ID */
+ uint pool_id, /*!< in: buffer pool ID */
buf_pool_info_t* all_pool_info); /*!< in/out: buffer pool info
to fill */
/** Return the ratio in percents of modified pages in the buffer pool /
@@ -1107,6 +1107,8 @@ Gets the compressed page descriptor corresponding to an uncompressed page
if applicable. */
#define buf_block_get_page_zip(block) \
((block)->page.zip.data ? &(block)->page.zip : NULL)
+#define is_buf_block_get_page_zip(block) \
+ ((block)->page.zip.data != 0)
#ifdef BTR_CUR_HASH_ADAPT
/** Get a buffer block from an adaptive hash index pointer.
@@ -1493,6 +1495,13 @@ public:
bool encrypted; /*!< page is still encrypted */
+ /** whether the page will be (re)initialized at the time it will
+ be written to the file, that is, whether the doublewrite buffer
+ can be safely skipped. Protected under similar conditions as
+ buf_block_t::frame. Can be set while holding buf_block_t::lock
+ X-latch and reset during page flush, while io_fix is in effect. */
+ bool init_on_flush;
+
ulint real_size; /*!< Real size of the page
Normal pages == srv_page_size
page compressed pages, payload