diff options
Diffstat (limited to 'storage/innobase/include/mem0mem.ic')
| -rw-r--r-- | storage/innobase/include/mem0mem.ic | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/innobase/include/mem0mem.ic b/storage/innobase/include/mem0mem.ic index dbad7cb6950..405b7338b51 100644 --- a/storage/innobase/include/mem0mem.ic +++ b/storage/innobase/include/mem0mem.ic @@ -277,7 +277,8 @@ mem_heap_free_heap_top( ut_ad(block); /* Set the free field of block */ - mem_block_set_free(block, old_top - (byte*) block); + mem_block_set_free(block, + ulint(old_top - reinterpret_cast<byte*>(block))); ut_ad(mem_block_get_start(block) <= mem_block_get_free(block)); UNIV_MEM_FREE(old_top, (byte*) block + block->len - old_top); @@ -547,7 +548,7 @@ mem_heap_get_size( size = heap->total_size; if (heap->free_block) { - size += UNIV_PAGE_SIZE; + size += srv_page_size; } return(size); |