Commit 73a33e71 authored by marko's avatar marko

branches/zip: Replace buf_pool->max_size with buf_pool->curr_size in

debug assertions.  This was forgotten from r977.
parent d266262a
...@@ -53,7 +53,7 @@ buf_pool_get_nth_block( ...@@ -53,7 +53,7 @@ buf_pool_get_nth_block(
ulint i) /* in: index of the block */ ulint i) /* in: index of the block */
{ {
ut_ad(buf_pool); ut_ad(buf_pool);
ut_ad(i < buf_pool->max_size); ut_ad(i < buf_pool->curr_size);
return(i + buf_pool->blocks); return(i + buf_pool->blocks);
} }
...@@ -115,7 +115,7 @@ buf_block_get_frame( ...@@ -115,7 +115,7 @@ buf_block_get_frame(
{ {
ut_ad(block); ut_ad(block);
ut_ad(block >= buf_pool->blocks); ut_ad(block >= buf_pool->blocks);
ut_ad(block < buf_pool->blocks + buf_pool->max_size); ut_ad(block < buf_pool->blocks + buf_pool->curr_size);
ut_ad(block->state != BUF_BLOCK_NOT_USED); ut_ad(block->state != BUF_BLOCK_NOT_USED);
ut_ad((block->state != BUF_BLOCK_FILE_PAGE) ut_ad((block->state != BUF_BLOCK_FILE_PAGE)
|| (block->buf_fix_count > 0)); || (block->buf_fix_count > 0));
...@@ -134,7 +134,7 @@ buf_block_get_space( ...@@ -134,7 +134,7 @@ buf_block_get_space(
{ {
ut_ad(block); ut_ad(block);
ut_ad(block >= buf_pool->blocks); ut_ad(block >= buf_pool->blocks);
ut_ad(block < buf_pool->blocks + buf_pool->max_size); ut_ad(block < buf_pool->blocks + buf_pool->curr_size);
ut_a(block->state == BUF_BLOCK_FILE_PAGE); ut_a(block->state == BUF_BLOCK_FILE_PAGE);
ut_ad(block->buf_fix_count > 0); ut_ad(block->buf_fix_count > 0);
...@@ -152,7 +152,7 @@ buf_block_get_page_no( ...@@ -152,7 +152,7 @@ buf_block_get_page_no(
{ {
ut_ad(block); ut_ad(block);
ut_ad(block >= buf_pool->blocks); ut_ad(block >= buf_pool->blocks);
ut_ad(block < buf_pool->blocks + buf_pool->max_size); ut_ad(block < buf_pool->blocks + buf_pool->curr_size);
ut_a(block->state == BUF_BLOCK_FILE_PAGE); ut_a(block->state == BUF_BLOCK_FILE_PAGE);
ut_ad(block->buf_fix_count > 0); ut_ad(block->buf_fix_count > 0);
......
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