diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-12 15:38:58 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-12 15:38:58 +0300 |
| commit | bb450b1fed862e7371db2dc8df8aae6f926261b0 (patch) | |
| tree | 57fbcbe8dd249daecec4baf630d996bd1c126568 | |
| parent | 8e3d85e112964c4f7c2d07710a3c8ee9d5041685 (diff) | |
| parent | 361e8284f3b8fadc8d95dcc43a8e5d01ca9997c8 (diff) | |
| download | mariadb-git-bb450b1fed862e7371db2dc8df8aae6f926261b0.tar.gz | |
Merge 10.2 into 10.3
| -rw-r--r-- | storage/innobase/btr/btr0btr.cc | 8 | ||||
| -rw-r--r-- | storage/innobase/buf/buf0flu.cc | 7 |
2 files changed, 12 insertions, 3 deletions
diff --git a/storage/innobase/btr/btr0btr.cc b/storage/innobase/btr/btr0btr.cc index ce736af2c11..98f64e8ce5c 100644 --- a/storage/innobase/btr/btr0btr.cc +++ b/storage/innobase/btr/btr0btr.cc @@ -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); } } diff --git a/storage/innobase/buf/buf0flu.cc b/storage/innobase/buf/buf0flu.cc index ae56fdae9ab..b116ca919fd 100644 --- a/storage/innobase/buf/buf0flu.cc +++ b/storage/innobase/buf/buf0flu.cc @@ -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; |