From 1e1b53ccfd0a09dbb0fe7fb10831669617339f2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Fri, 11 Oct 2019 21:24:48 +0300 Subject: [PATCH] After-merge fix: Correct an assertion During IMPORT TABLESPACE, we do invoke buf_flush_init_for_writing() with block==NULL and newest_lsn!=0. --- storage/innobase/buf/buf0flu.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/innobase/buf/buf0flu.cc b/storage/innobase/buf/buf0flu.cc index 5df1b9e286b..32d5ba34ddb 100644 --- a/storage/innobase/buf/buf0flu.cc +++ b/storage/innobase/buf/buf0flu.cc @@ -854,7 +854,7 @@ buf_flush_init_for_writing( ut_ad(block == NULL || block->frame == page); ut_ad(block == NULL || page_zip_ == NULL || &block->page.zip == page_zip_); - ut_ad(!srv_safe_truncate || !block == !newest_lsn); + ut_ad(!srv_safe_truncate || !block || newest_lsn); ut_ad(page); ut_ad(!srv_safe_truncate || !newest_lsn || fil_page_get_type(page));