diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-30 11:12:56 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-30 11:12:56 +0300 |
| commit | 1a9b6c4c7f817155f5ce8b1a6062d0eccbfd10ec (patch) | |
| tree | c1da70f7f990dae02c5dfe70fd75299ced68873c /storage/innobase/ibuf | |
| parent | 0fb84216a35046a4574dec214dcce03130a797c1 (diff) | |
| parent | b11ff3d49581d9e7b6f8b990f08e85e4d6384418 (diff) | |
| download | mariadb-git-1a9b6c4c7f817155f5ce8b1a6062d0eccbfd10ec.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/ibuf')
| -rw-r--r-- | storage/innobase/ibuf/ibuf0ibuf.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/storage/innobase/ibuf/ibuf0ibuf.cc b/storage/innobase/ibuf/ibuf0ibuf.cc index 38814da0c8d..26ba7f6a388 100644 --- a/storage/innobase/ibuf/ibuf0ibuf.cc +++ b/storage/innobase/ibuf/ibuf0ibuf.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1997, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2016, 2019, MariaDB Corporation. +Copyright (c) 2016, 2020 MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -28,6 +28,8 @@ Created 7/19/1997 Heikki Tuuri #include "sync0sync.h" #include "btr0sea.h" +using st_::span; + #if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG my_bool srv_ibuf_disable_background_merge; #endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */ @@ -4948,7 +4950,8 @@ dberr_t ibuf_check_bitmap_on_import(const trx_t* trx, fil_space_t* space) bitmap_page = ibuf_bitmap_get_map_page( page_id_t(space->id, page_no), page_size, &mtr); - if (buf_page_is_zeroes(bitmap_page, page_size.physical())) { + if (buf_is_zeroes(span<const byte>(bitmap_page, + page_size.physical()))) { /* This means we got all-zero page instead of ibuf bitmap page. The subsequent page should be all-zero pages. */ @@ -4960,8 +4963,8 @@ dberr_t ibuf_check_bitmap_on_import(const trx_t* trx, fil_space_t* space) page_id_t(space->id, curr_page), page_size, RW_S_LATCH, &mtr); page_t* page = buf_block_get_frame(block); - ut_ad(buf_page_is_zeroes( - page, page_size.physical())); + ut_ad(buf_is_zeroes(span<const byte>( + page, page_size.physical()))); } #endif /* UNIV_DEBUG */ ibuf_exit(&mtr); |