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

into hundin.mysql.fi:/home/heikki/mysql3

Merge heikki@work.mysql.com:/home/bk/mysql
into hundin.mysql.fi:/home/heikki/mysql3
3fb69e88 · unknown · d182a5d7 · 3e85f33c · 3fb69e88
Commit 3fb69e88 authored Jun 26, 2002 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

innobase/include/buf0buf.ic innobase/include/buf0buf.ic +2 -2

No files found.
--- a/innobase/include/buf0buf.ic
+++ b/innobase/include/buf0buf.ic
@@ -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);