summaryrefslogtreecommitdiff
path: root/storage/innobase/buf/buf0buddy.cc
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2020-03-14 15:24:13 +0200
committerMonty <monty@mariadb.org>2020-03-14 15:24:13 +0200
commit5754ea2eca0ffa191b4be46fdebf2d49c438f151 (patch)
tree46379a41fee07a5da2e206206efdc4919e66bf13 /storage/innobase/buf/buf0buddy.cc
parent41cba6c90b17c0f81642e532076d860487cf52c7 (diff)
downloadmariadb-git-5754ea2eca0ffa191b4be46fdebf2d49c438f151.tar.gz
Fixed compiler failures with gcc 7.4.1 and new my_malloc code
Diffstat (limited to 'storage/innobase/buf/buf0buddy.cc')
-rw-r--r--storage/innobase/buf/buf0buddy.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/buf/buf0buddy.cc b/storage/innobase/buf/buf0buddy.cc
index 7e3c06892a0..f660ff508c1 100644
--- a/storage/innobase/buf/buf0buddy.cc
+++ b/storage/innobase/buf/buf0buddy.cc
@@ -333,9 +333,9 @@ static buf_buddy_free_t* buf_buddy_alloc_zip(ulint i)
if (buf) {
/* Trash the page other than the BUF_BUDDY_STAMP_NONFREE. */
- UNIV_MEM_TRASH((void*) buf, ~i, BUF_BUDDY_STAMP_OFFSET);
+ UNIV_MEM_TRASH((void*) buf, (int) ~i, BUF_BUDDY_STAMP_OFFSET);
UNIV_MEM_TRASH(BUF_BUDDY_STAMP_OFFSET + 4
- + buf->stamp.bytes, ~i,
+ + buf->stamp.bytes, (int) ~i,
(BUF_BUDDY_LOW << i)
- (BUF_BUDDY_STAMP_OFFSET + 4));
ut_ad(mach_read_from_4(buf->stamp.bytes