summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2023-03-20 14:28:03 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2023-03-20 14:28:03 +0200
commit535a38c4559160c7a46f0d9ece52495b83718d45 (patch)
tree9ccb1f05f8b0e45de0388ed880d9402831af44ac
parent32a53a66df0369a446db1e41f5123afe62e793fb (diff)
downloadmariadb-git-535a38c4559160c7a46f0d9ece52495b83718d45.tar.gz
MDEV-30400 fixup: Fix the UNIV_ZIP_DEBUG build
-rw-r--r--storage/innobase/btr/btr0btr.cc4
-rw-r--r--storage/innobase/btr/btr0cur.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/btr/btr0btr.cc b/storage/innobase/btr/btr0btr.cc
index e54c2a101b8..0b74d3b4311 100644
--- a/storage/innobase/btr/btr0btr.cc
+++ b/storage/innobase/btr/btr0btr.cc
@@ -3316,7 +3316,7 @@ insert_empty:
ut_a(!insert_page_zip
|| page_zip_validate(insert_page_zip, insert_page,
- cursor->index));
+ cursor->index()));
}
#endif /* UNIV_ZIP_DEBUG */
@@ -4378,7 +4378,7 @@ btr_discard_page(
#ifdef UNIV_ZIP_DEBUG
if (page_zip_des_t* merge_page_zip
- = buf_block_get_page_zip(merge_block));
+ = buf_block_get_page_zip(merge_block))
ut_a(page_zip_validate(merge_page_zip,
merge_block->page.frame, index));
#endif /* UNIV_ZIP_DEBUG */
diff --git a/storage/innobase/btr/btr0cur.cc b/storage/innobase/btr/btr0cur.cc
index 27ed631099d..5b76a39b865 100644
--- a/storage/innobase/btr/btr0cur.cc
+++ b/storage/innobase/btr/btr0cur.cc
@@ -1673,7 +1673,7 @@ dberr_t btr_cur_t::pessimistic_search_leaf(const dtuple_t *tuple,
mtr->upgrade_buffer_fix(block_savepoint, RW_X_LATCH);
#ifdef UNIV_ZIP_DEBUG
const page_zip_des_t *page_zip= buf_block_get_page_zip(block);
- ut_a(!page_zip || page_zip_validate(page_zip, page, index()));
+ ut_a(!page_zip || page_zip_validate(page_zip, block->page.frame, index()));
#endif /* UNIV_ZIP_DEBUG */
if (page_has_next(block->page.frame) &&
!btr_block_get(*index(), btr_page_get_next(block->page.frame),