bk commit into 5.1 tree (jonas:1.2829) BUG#33739

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas.  When jonas 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, 2008-01-08 14:21:17+01:00, jonas@stripped +1 -0
  ndb - bug#33739
    Additional fix for bug#33739 (63 and upwards)
    reset realpid_mm to cater for page being released

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@stripped, 2008-01-08 14:21:13+01:00,
jonas@stripped +8 -0
    Additional fix for bug#33739 (63 and upwards)
    reset realpid_mm to cater for page being released

diff -Nrup a/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp
b/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp	2008-01-08 13:29:10 +01:00
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp	2008-01-08 14:21:13 +01:00
@@ -635,6 +635,7 @@ Dbtup::scanNext(Signal* signal, ScanOpPt
      * We need to refetch page after timeslice
      */
     pos.m_get = ScanPos::Get_page;
+    pos.m_realpid_mm = RNIL;
     break;
   default:
     break;
@@ -875,6 +876,13 @@ Dbtup::scanNext(Signal* signal, ScanOpPt
         if (key.m_page_idx + size <= Fix_page::DATA_WORDS) 
 	{
 	  pos.m_get = ScanPos::Get_next_tuple_fs;
+#ifdef VM_TRACE
+          if (! (bits & ScanOp::SCAN_DD))
+          {
+            Uint32 realpid = getRealpidCheck(fragPtr.p, key.m_page_no);
+            ndbassert(pos.m_realpid_mm == realpid);
+          }
+#endif
           th = (Tuple_header*)&page->m_data[key.m_page_idx];
 	  
 	  if (likely(! (bits & ScanOp::SCAN_NR)))