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

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

1 files changed, 2 insertions, 4 deletions

diff --git a/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp b/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
index a82c96beebd..f3d5b8a89ef 100644
--- a/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
+++ b/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
@@ -11242,10 +11242,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();
@@ -11890,8 +11890,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;