diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-03-13 08:15:06 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-03-13 08:15:06 +0200 |
| commit | 7fb03d7abf4e668d76aded38378120361c218ba4 (patch) | |
| tree | ab6a8f7d29479970e5d3b48b0d671d1dc07c166e /storage/innobase/fsp | |
| parent | 09c5c335e3e8447e7d07c987293042175b51b495 (diff) | |
| parent | 1c4b6afbaaf7dbcee4b035d1bf79156fa68a6475 (diff) | |
| download | mariadb-git-7fb03d7abf4e668d76aded38378120361c218ba4.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'storage/innobase/fsp')
| -rw-r--r-- | storage/innobase/fsp/fsp0fsp.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/storage/innobase/fsp/fsp0fsp.cc b/storage/innobase/fsp/fsp0fsp.cc index dd0148a3275..c8e71381491 100644 --- a/storage/innobase/fsp/fsp0fsp.cc +++ b/storage/innobase/fsp/fsp0fsp.cc @@ -600,17 +600,14 @@ fsp_init_file_page_low( buf_block_t* block) /*!< in: pointer to a page */ { page_t* page = buf_block_get_frame(block); - page_zip_des_t* page_zip= buf_block_get_page_zip(block); - if (!fsp_is_system_temporary(block->page.id.space())) { - memset(page, 0, UNIV_PAGE_SIZE); - } + memset(page, 0, UNIV_PAGE_SIZE); mach_write_to_4(page + FIL_PAGE_OFFSET, block->page.id.page_no()); mach_write_to_4(page + FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID, block->page.id.space()); - if (page_zip) { + if (page_zip_des_t* page_zip= buf_block_get_page_zip(block)) { memset(page_zip->data, 0, page_zip_get_size(page_zip)); memcpy(page_zip->data + FIL_PAGE_OFFSET, page + FIL_PAGE_OFFSET, 4); |