Commit fc1eeba8 authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/41-work 

into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
parents 282ff5f1 f287b4a8

ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp

+6 −4
Original line number Diff line number Diff line
@@ -1113,14 +1113,16 @@ Dbtup::updateStartLab(Signal* signal, 
                                regOperPtr->pageOffset,

                                &cinBuffer[0],

                                regOperPtr->attrinbufLen);

    if (retValue == -1) {

      tupkeyErrorLab(signal);

      return -1;

    }//if

  } else {

    jam();

    retValue = interpreterStartLab(signal, pagePtr, regOperPtr->pageOffset);

  }//if



  if (retValue == -1) {

    tupkeyErrorLab(signal);

    return -1;

  }//if



  ndbrequire(regOperPtr->tupVersion != ZNIL);

  pagePtr->pageWord[regOperPtr->pageOffset + 1] = regOperPtr->tupVersion;

  if (regTabPtr->checksumIndicator) {