diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-11 21:24:48 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-11 21:24:48 +0300 |
| commit | 1e1b53ccfd0a09dbb0fe7fb10831669617339f2d (patch) | |
| tree | 6b3da1d5f3ebb2009056e60012ea7b3a3a230f95 | |
| parent | 966d97b5f9ff8673fdb1da0ce6ad51a72b62afc4 (diff) | |
| download | mariadb-git-1e1b53ccfd0a09dbb0fe7fb10831669617339f2d.tar.gz | |
After-merge fix: Correct an assertion
During IMPORT TABLESPACE, we do invoke
buf_flush_init_for_writing() with block==NULL and newest_lsn!=0.
| -rw-r--r-- | storage/innobase/buf/buf0flu.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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)); |