rendered paste body===== ../../include/pagecache.h 1.13 vs edited =====
*** /tmp/bk_pagecache.h-1.13_kbdwab 2007-06-05 12:13:43 +03:00
--- edited/../../include/pagecache.h 2007-06-29 14:02:08 +03:00
***************
*** 34,40 ****
/* the page does not contain LSN */
PAGECACHE_PLAIN_PAGE,
/* the page contain LSN (maria tablespace page) */
! PAGECACHE_LSN_PAGE
};
/*
--- 34,42 ----
/* the page does not contain LSN */
PAGECACHE_PLAIN_PAGE,
/* the page contain LSN (maria tablespace page) */
! PAGECACHE_LSN_PAGE,
! /* Page type used when scanning file and we don't care about the type */
! PAGECACHE_READ_UNKNOWN_PAGE
};
/*
===== ma_pagecache.c 1.24 vs edited =====
*** 2858,2865 ****
(pin == PAGECACHE_PIN)),
&page_st);
DBUG_ASSERT(block->type == PAGECACHE_EMPTY_PAGE ||
! block->type == type);
! block->type= type;
if (((block->status & PCBLOCK_ERROR) == 0) && (page_st != PAGE_READ))
{
DBUG_PRINT("info", ("read block 0x%lx", (ulong)block));
--- 2861,2870 ----
(pin == PAGECACHE_PIN)),
&page_st);
DBUG_ASSERT(block->type == PAGECACHE_EMPTY_PAGE ||
! block->type == type || type == PAGECACHE_READ_UNKNOWN_PAGE);
! if (type != PAGECACHE_READ_UNKNOWN_PAGE ||
! block->type == PAGECACHE_EMPTY_PAGE)
! block->type= type;
if (((block->status & PCBLOCK_ERROR) == 0) && (page_st != PAGE_READ))
{
DBUG_PRINT("info", ("read block 0x%lx", (ulong)block));
***************
*** 3223,3228 ****
--- 3228,3234 ----
}
DBUG_ASSERT(block->type == PAGECACHE_EMPTY_PAGE ||
+ block->type == PAGECACHE_READ_UNKNOWN_PAGE ||
block->type == type);
block->type= type;