mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 05:52:27 +01:00
branches/zip: Replace buf_pool->max_size with buf_pool->curr_size in
debug assertions. This was forgotten from r977.
This commit is contained in:
parent
d266262af6
commit
73a33e7100
1 changed files with 4 additions and 4 deletions
|
@ -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(
|
||||||
{
|
{
|
||||||
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(
|
||||||
{
|
{
|
||||||
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(
|
||||||
{
|
{
|
||||||
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);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue