Skip to content

Commit a096f12

Browse files
committed
MDEV-29445 fixup: debug assertion
buf_buddy_alloc_from(): Pass the correct argument to buf_pool.contains_zip(). This fixes a failure of the test encryption.innochecksum when the code is built with cmake -DWITH_UBSAN=ON -DCMAKE_BUILD_TYPE=Debug
1 parent 60638a8 commit a096f12

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

storage/innobase/buf/buf0buddy.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ static void *buf_buddy_alloc_from(void *buf, ulint i)
385385
ut_ad(i >= buf_buddy_get_slot(UNIV_ZIP_SIZE_MIN));
386386
ut_ad(i <= BUF_BUDDY_SIZES);
387387
ut_ad(!ut_align_offset(buf, srv_page_size));
388-
ut_ad(!buf_pool.contains_zip(buf, srv_page_size));
388+
ut_ad(!buf_pool.contains_zip(buf, srv_page_size_shift));
389389

390390
/* Add the unused parts of the block to the free lists. */
391391
for (ulint j = BUF_BUDDY_SIZES, offs = srv_page_size; j-- > i; ) {

0 commit comments

Comments
 (0)