bk commit into 5.1 tree (jonas:1.2328) BUG#24331

[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, 2006-11-21 14:21:11+01:00, jonas@stripped +2 -0
  ndb - bug#24331
    Make sure LCP scan record is correct initialized

  storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp@stripped, 2006-11-21 14:21:10+01:00,
jonas@stripped +1 -0
    Init ScanOp

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@stripped, 2006-11-21 14:21:10+01:00,
jonas@stripped +5 -2
    And set correct pointers...

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-work

--- 1.31/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp	2006-11-21 14:21:16 +01:00
+++ 1.32/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp	2006-11-21 14:21:16 +01:00
@@ -329,6 +329,7 @@
 
   ScanOpPtr lcp;
   ndbrequire(c_scanOpPool.seize(lcp));
+  new (lcp.p) ScanOp();
   c_lcp_scan_op= lcp.i;
 
   czero = 0;

--- 1.15/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp	2006-11-21 14:21:16 +01:00
+++ 1.16/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp	2006-11-21 14:21:16 +01:00
@@ -87,6 +87,7 @@
       
       ndbrequire(frag.m_lcp_scan_op == c_lcp_scan_op);
       c_scanOpPool.getPtr(scanPtr, frag.m_lcp_scan_op);
+      ndbrequire(scanPtr.p->m_fragPtrI == fragPtr.i);
       bits |= ScanOp::SCAN_LCP;
       if (tablePtr.p->m_attributes[MM].m_no_of_varsize > 0) {
         bits |= ScanOp::SCAN_VS;
@@ -1038,6 +1039,7 @@
   {
     ndbrequire(fragPtr.p->m_lcp_scan_op == scanPtr.i);
     fragPtr.p->m_lcp_scan_op = RNIL;
+    scanPtr.p->m_fragPtrI = RNIL;
   }
 }
 
@@ -1064,8 +1066,9 @@
     frag.m_lcp_scan_op = c_lcp_scan_op;
     ScanOpPtr scanPtr;
     c_scanOpPool.getPtr(scanPtr, frag.m_lcp_scan_op);
-    //ndbrequire(scanPtr.p->m_fragPtrI == fragPtr.i); ?
-
+    ndbrequire(scanPtr.p->m_fragPtrI == RNIL);
+    scanPtr.p->m_fragPtrI = fragPtr.i;
+    
     scanFirst(signal, scanPtr);
     scanPtr.p->m_state = ScanOp::First;
   }