Commit f8da258f authored by marko's avatar marko

branches/zip: Since r1057, page_zip_des_init() affects

buf_block_get_state().

buf_block_init(), buf_page_init_for_backup_restore(): Assign
block->page.zip.state after invoking page_zip_des_init(&block->page).
parent 12b589c3
...@@ -603,8 +603,6 @@ buf_block_init( ...@@ -603,8 +603,6 @@ buf_block_init(
buf_block_t* block, /* in: pointer to control block */ buf_block_t* block, /* in: pointer to control block */
byte* frame) /* in: pointer to buffer frame */ byte* frame) /* in: pointer to buffer frame */
{ {
block->page.zip.state = BUF_BLOCK_NOT_USED;
block->frame = frame; block->frame = frame;
block->buf_fix_count = 0; block->buf_fix_count = 0;
...@@ -626,6 +624,7 @@ buf_block_init( ...@@ -626,6 +624,7 @@ buf_block_init(
block->n_pointers = 0; block->n_pointers = 0;
#endif /* UNIV_DEBUG */ #endif /* UNIV_DEBUG */
page_zip_des_init(&block->page.zip); page_zip_des_init(&block->page.zip);
block->page.zip.state = BUF_BLOCK_NOT_USED;
mutex_create(&block->mutex, SYNC_BUF_BLOCK); mutex_create(&block->mutex, SYNC_BUF_BLOCK);
...@@ -1805,6 +1804,8 @@ buf_page_init_for_backup_restore( ...@@ -1805,6 +1804,8 @@ buf_page_init_for_backup_restore(
block->n_bytes = 0; block->n_bytes = 0;
block->left_side = TRUE; block->left_side = TRUE;
page_zip_des_init(&block->page); page_zip_des_init(&block->page);
block->page.zip.state = BUF_BLOCK_FILE_PAGE;
/* We assume that block->page.data has been allocated /* We assume that block->page.data has been allocated
with zip_size == UNIV_PAGE_SIZE. */ with zip_size == UNIV_PAGE_SIZE. */
ut_ad(zip_size <= UNIV_PAGE_SIZE); ut_ad(zip_size <= UNIV_PAGE_SIZE);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment