Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged

ndb/src/kernel/blocks/dbacc/DbaccMain.cpp

@@ -11254,10 +11254,10 @@ void Dbacc::execACC_CHECK_SCAN(Signal* signal)
     operationRecPtr.i = scanPtr.p->scanFirstQueuedOp;
     ptrCheckGuard(operationRecPtr, coprecsize, operationrec);
     takeOutReadyScanQueue(signal);
+    fragrecptr.i = operationRecPtr.p->fragptr;
+    ptrCheckGuard(fragrecptr, cfragmentsize, fragmentrec);
     if (operationRecPtr.p->elementIsDisappeared == ZTRUE) {
       jam();
-      fragrecptr.i = operationRecPtr.p->fragptr;
-      ptrCheckGuard(fragrecptr, cfragmentsize, fragmentrec);
       if (fragrecptr.p->createLcp == ZTRUE) {
         if (remainingUndoPages() < ZMIN_UNDO_PAGES_AT_COMMIT) {
           jam();
@@ -11902,8 +11902,6 @@ void Dbacc::sendNextScanConf(Signal* signal)
     return;
   }//if
   
-  fragrecptr.i = operationRecPtr.p->fragptr;
-  ptrCheckGuard(fragrecptr, cfragmentsize, fragmentrec);
   if (fragrecptr.p->keyLength != 0) {
     jam();
     signal->theData[0] = scanPtr.p->scanUserptr;