mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 14:54:20 +01:00
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).
This commit is contained in:
parent
8e9b9a995f
commit
b34c10581d
1 changed files with 3 additions and 2 deletions
|
@ -603,8 +603,6 @@ buf_block_init(
|
|||
buf_block_t* block, /* in: pointer to control block */
|
||||
byte* frame) /* in: pointer to buffer frame */
|
||||
{
|
||||
block->page.zip.state = BUF_BLOCK_NOT_USED;
|
||||
|
||||
block->frame = frame;
|
||||
|
||||
block->buf_fix_count = 0;
|
||||
|
@ -626,6 +624,7 @@ buf_block_init(
|
|||
block->n_pointers = 0;
|
||||
#endif /* UNIV_DEBUG */
|
||||
page_zip_des_init(&block->page.zip);
|
||||
block->page.zip.state = BUF_BLOCK_NOT_USED;
|
||||
|
||||
mutex_create(&block->mutex, SYNC_BUF_BLOCK);
|
||||
|
||||
|
@ -1805,6 +1804,8 @@ buf_page_init_for_backup_restore(
|
|||
block->n_bytes = 0;
|
||||
block->left_side = TRUE;
|
||||
page_zip_des_init(&block->page);
|
||||
block->page.zip.state = BUF_BLOCK_FILE_PAGE;
|
||||
|
||||
/* We assume that block->page.data has been allocated
|
||||
with zip_size == UNIV_PAGE_SIZE. */
|
||||
ut_ad(zip_size <= UNIV_PAGE_SIZE);
|
||||
|
|
Loading…
Add table
Reference in a new issue