Commit f454c986 authored by heikki@hundin.mysql.fi's avatar heikki@hundin.mysql.fi
Browse files

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

into hundin.mysql.fi:/home/heikki/mysql3
parents 212421dc ded11708

innobase/include/buf0buf.ic

+2 −2
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ buf_block_align( 


	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);

	ut_a(block >= buf_pool->blocks);

	ut_a(block < buf_pool->blocks + buf_pool->max_size);
@@ -236,7 +236,7 @@ buf_block_align_low( 


	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);

	ut_a(block >= buf_pool->blocks);

	ut_a(block < buf_pool->blocks + buf_pool->max_size);