database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2019-10-12 15:38:58 +03:00
parent 8e3d85e112 361e8284f3
commit bb450b1fed
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
storage/innobase/btr/btr0btr.cc
View File

@@ -759,9 +759,11 @@ void btr_page_free(dict_index_t* index, buf_block_t* block, mtr_t* mtr,
ut_ad(mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX));
if (srv_immediate_scrub_data_uncompressed) {
/* In MDEV-15528 this call must be removed, and we should
zero out the page after the redo log for this mini-transaction
has been durably written. */
/* In MDEV-15528 this code must be removed and the
check in buf_flush_init_for_writing() re-enabled. We
should zero out the page after the redo log for this
mini-transaction has been durably written. The log
would include the 10.4 MLOG_INIT_FREE_PAGE record. */
fsp_init_file_page(index->table->space, block, mtr);
}
}

7
storage/innobase/buf/buf0flu.cc
View File

@@ -857,7 +857,14 @@ buf_flush_init_for_writing(
|| &block->page.zip == page_zip_);
ut_ad(!block || newest_lsn);
ut_ad(page);
#if 0 /* MDEV-15528 TODO: reinstate this check */
/* innodb_immediate_scrub_data_uncompressed=ON would cause
fsp_init_file_page() to be called on freed pages, and thus
cause them to be written as almost-all-zeroed.
In MDEV-15528 we should change that implement an option to
make freed pages appear all-zero, bypassing this code. */
ut_ad(!newest_lsn || fil_page_get_type(page));
#endif
if (page_zip_) {
page_zip_des_t* page_zip;