Skip to content

M
mariadb
Commit 6a51cbb0 authored by unknown's avatar unknown
Browse files
Options

Merge heikki@work.mysql.com:/home/bk/mysql 

into hundin.mysql.fi:/home/heikki/mysql3
parents 15171d97 36bcddf9
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
innobase/include/buf0buf.ic
View file @ 6a51cbb0
...@@ -209,7 +209,7 @@ buf_block_align( ...@@ -209,7 +209,7 @@ buf_block_align(
ut_ad((ulint)ptr >= (ulint)frame_zero); ut_ad((ulint)ptr >= (ulint)frame_zero);
block = buf_pool_get_nth_block(buf_pool, (ptr - frame_zero) block = buf_pool_get_nth_block(buf_pool, ((ulint)(ptr - frame_zero))
>> UNIV_PAGE_SIZE_SHIFT); >> UNIV_PAGE_SIZE_SHIFT);
ut_a(block >= buf_pool->blocks); ut_a(block >= buf_pool->blocks);
ut_a(block < buf_pool->blocks + buf_pool->max_size); ut_a(block < buf_pool->blocks + buf_pool->max_size);
...@@ -236,7 +236,7 @@ buf_block_align_low( ...@@ -236,7 +236,7 @@ buf_block_align_low(
ut_ad((ulint)ptr >= (ulint)frame_zero); ut_ad((ulint)ptr >= (ulint)frame_zero);
block = buf_pool_get_nth_block(buf_pool, (ptr - frame_zero) block = buf_pool_get_nth_block(buf_pool, ((ulint)(ptr - frame_zero))
>> UNIV_PAGE_SIZE_SHIFT); >> UNIV_PAGE_SIZE_SHIFT);
ut_a(block >= buf_pool->blocks); ut_a(block >= buf_pool->blocks);
ut_a(block < buf_pool->blocks + buf_pool->max_size); ut_a(block < buf_pool->blocks + buf_pool->max_size);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7