Commit e4947433 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/jonas/src/mysql-4.1
parents 1c0c25e7 5827a23b

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

+2 −4
Original line number Diff line number Diff line
@@ -11242,10 +11242,10 @@ void Dbacc::execACC_CHECK_SCAN(Signal* signal) 
    operationRecPtr.i = scanPtr.p->scanFirstQueuedOp;

    ptrCheckGuard(operationRecPtr, coprecsize, operationrec);

    takeOutReadyScanQueue(signal);

    if (operationRecPtr.p->elementIsDisappeared == ZTRUE) {

      jam();

    fragrecptr.i = operationRecPtr.p->fragptr;

    ptrCheckGuard(fragrecptr, cfragmentsize, fragmentrec);

    if (operationRecPtr.p->elementIsDisappeared == ZTRUE) {

      jam();

      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;