Merge with 5.2

162dd48f · Michael Widenius · 1fbcaf2e · acb30953 · 162dd48f
Commit 162dd48f authored Jan 12, 2011 by Michael Widenius
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

storage/maria/ma_pagecache.c storage/maria/ma_pagecache.c +1 -1

No files found.
--- a/storage/maria/ma_pagecache.c
+++ b/storage/maria/ma_pagecache.c
@@ -4216,7 +4216,7 @@ static void free_block(PAGECACHE *pagecache, PAGECACHE_BLOCK_LINK *block)
  DBUG_ASSERT(block->rlocks == 0);
  DBUG_ASSERT(block->rlocks_queue == 0);
  DBUG_ASSERT(block->pins == 0);
-  DBUG_ASSERT((block->status & ~(PCBLOCK_ERROR | PCBLOCK_READ | PCBLOCK_IN_FLUSH | PCBLOCK_CHANGED | PCBLOCK_REASSIGNED)) == 0);
+  DBUG_ASSERT((block->status & ~(PCBLOCK_ERROR | PCBLOCK_READ | PCBLOCK_IN_FLUSH | PCBLOCK_CHANGED | PCBLOCK_REASSIGNED | PCBLOCK_DEL_WRITE)) == 0);
  block->status= 0;
 #ifndef DBUG_OFF
  block->type= PAGECACHE_EMPTY_PAGE;