Merge 10.1 into 10.2

Do not merge the InnoDB changes for MDEV-20813.

Merge 10.1 into 10.2
Do not merge the InnoDB changes for MDEV-20813.
4f9f3f19 · Marko Mäkelä · 361e8284 · ae702d76 · 4f9f3f19
Commit 4f9f3f19 authored Oct 14, 2019 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

storage/xtradb/buf/buf0flu.cc storage/xtradb/buf/buf0flu.cc +0 -1

No files found.
--- a/storage/xtradb/buf/buf0flu.cc
+++ b/storage/xtradb/buf/buf0flu.cc
@@ -787,7 +787,6 @@ buf_flush_init_for_writing(
 	ib_uint32_t	checksum = 0 /* silence bogus gcc warning */;

 	ut_ad(page);
-	ut_ad(!newest_lsn || fil_page_get_type(page));

 	if (page_zip_) {
 		page_zip_des_t*	page_zip;