bk commit into 5.1 tree (pekka:1.2498) BUG#29176

[pekka]

Below is the list of changes that have just been committed into a local
5.1 repository of pekka. When pekka does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-24 22:14:09+02:00, pekka@stripped +1 -0
  ndb - bug#29176 pgman: another missing stack pruning related to drop table

  storage/ndb/src/kernel/blocks/pgman.cpp@stripped, 2007-06-24 22:12:18+02:00,
pekka@stripped +10 -1
    another missing pgman stack pruning related to drop_page

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	pekka
# Host:	ndb13.mysql.com
# Root:	/space/pekka/ndb/version/my51-bug29176

--- 1.26/storage/ndb/src/kernel/blocks/pgman.cpp	2007-06-24 22:14:14 +02:00
+++ 1.27/storage/ndb/src/kernel/blocks/pgman.cpp	2007-06-24 22:14:14 +02:00
@@ -695,7 +695,14 @@
     if (state & Page_entry::ONSTACK)
     {
       jam();
+      bool at_bottom = ! pl_stack.hasPrev(ptr);
       pl_stack.remove(ptr);
+      if (at_bottom)
+      {
+        jam();
+        ndbassert(state & Page_entry::HOT);
+        lirs_stack_prune();
+      }
     }
     pl_stack.add(ptr);
     state |= Page_entry::ONSTACK;
@@ -1891,9 +1898,10 @@
       bool at_bottom = ! pl_stack.hasPrev(ptr);
       pl_stack.remove(ptr);
       state &= ~ Page_entry::ONSTACK;
-      if (at_bottom && (state & Page_entry::HOT))
+      if (at_bottom)
       {
         jam();
+        ndbassert(state & Page_entry::HOT);
         lirs_stack_prune();
       }
     }
@@ -1905,6 +1913,7 @@
       state &= ~ Page_entry::ONQUEUE;
     }
 
+    ndbassert(ptr.p->m_real_page_i != RNIL);
     if (ptr.p->m_real_page_i != RNIL)
     {
       jam();