Commit a8007724 authored by unknown's avatar unknown
Browse files

merge

parents fe9bbb24 5827a23b

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

+2 −2
Original line number Diff line number Diff line
@@ -9645,10 +9645,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();