Merge 10.2 into 10.3

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);
 	}
 }

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;