[Commits] Rev 2911: Fixed assert as Aria in 5.2 has more flags than 5.1 in lp:maria/5.2

Michael Widenius monty at askmonty.org
Wed Jan 12 17:58:14 EET 2011


At lp:maria/5.2

------------------------------------------------------------
revno: 2911
revision-id: monty at askmonty.org-20110112155813-n602fefffgp2widb
parent: monty at askmonty.org-20110112153813-xlyrhakqe5j3r9ae
committer: Michael Widenius <monty at askmonty.org>
branch nick: maria-5.2
timestamp: Wed 2011-01-12 17:58:13 +0200
message:
  Fixed assert as Aria in 5.2 has more flags than 5.1
-------------- next part --------------
=== modified file 'storage/maria/ma_pagecache.c'
--- a/storage/maria/ma_pagecache.c	2011-01-12 15:38:13 +0000
+++ b/storage/maria/ma_pagecache.c	2011-01-12 15:58:13 +0000
@@ -4216,7 +4216,7 @@ static void free_block(PAGECACHE *pageca
   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;



More information about the commits mailing list