Commit 8968be81 authored by unknown's avatar unknown
Browse files

Let blobs use committedRead, this is always correct as 

as read lock is held on primary table


ndb/src/ndbapi/NdbConnection.cpp:
  merge error
parent d6424368

ndb/src/ndbapi/NdbBlob.cpp

+5 −5
Original line number Diff line number Diff line
@@ -867,7 +867,7 @@ NdbBlob::readParts(char* buf, Uint32 part, Uint32 count) 
  while (n < count) {

    NdbOperation* tOp = theNdbCon->getNdbOperation(theBlobTable);

    if (tOp == NULL ||

        tOp->readTuple() == -1 ||

        tOp->committedRead() == -1 ||

        setPartKeyValue(tOp, part + n) == -1 ||

        tOp->getValue((Uint32)3, buf) == NULL) {

      setErrorCode(tOp);
@@ -1144,7 +1144,7 @@ NdbBlob::preExecute(ExecType anExecType, bool& batch) 
      // add operation before this one to read head+inline

      NdbOperation* tOp = theNdbCon->getNdbOperation(theTable, theNdbOp);

      if (tOp == NULL ||

          tOp->readTuple() == -1 ||

          tOp->committedRead() == -1 ||

          setTableKeyValue(tOp) == -1 ||

          getHeadInlineValue(tOp) == -1) {

        setErrorCode(tOp);
@@ -1163,7 +1163,7 @@ NdbBlob::preExecute(ExecType anExecType, bool& batch) 
        Uint32 pkAttrId = theAccessTable->getNoOfColumns() - 1;

        NdbOperation* tOp = theNdbCon->getNdbOperation(theAccessTable, theNdbOp);

        if (tOp == NULL ||

            tOp->readTuple() == -1 ||

            tOp->committedRead() == -1 ||

            setAccessKeyValue(tOp) == -1 ||

            tOp->getValue(pkAttrId, theKeyBuf.data) == NULL) {

          setErrorCode(tOp);
@@ -1172,7 +1172,7 @@ NdbBlob::preExecute(ExecType anExecType, bool& batch) 
      } else {

        NdbOperation* tOp = theNdbCon->getNdbIndexOperation(theAccessTable->m_index, theTable, theNdbOp);

        if (tOp == NULL ||

            tOp->readTuple() == -1 ||

            tOp->committedRead() == -1 ||

            setAccessKeyValue(tOp) == -1 ||

            getTableKeyValue(tOp) == -1) {

          setErrorCode(tOp);
@@ -1184,7 +1184,7 @@ NdbBlob::preExecute(ExecType anExecType, bool& batch) 
      // add op before this one to read head+inline via index

      NdbIndexOperation* tOp = theNdbCon->getNdbIndexOperation(theAccessTable->m_index, theTable, theNdbOp);

      if (tOp == NULL ||

          tOp->readTuple() == -1 ||

          tOp->committedRead() == -1 ||

          setAccessKeyValue(tOp) == -1 ||

          getHeadInlineValue(tOp) == -1) {

        setErrorCode(tOp);

ndb/src/ndbapi/NdbConnection.cpp

+0 −1
Original line number Diff line number Diff line
@@ -528,7 +528,6 @@ NdbConnection::executeAsynchPrepare( ExecType aTypeOfExec, 
        tLastOp->theCommitIndicator = 1;

      }//if

    } else {

      if (aTypeOfExec == Commit) {

      if (aTypeOfExec == Commit && !theSimpleState) {

	/**********************************************************************

	 *   A Transaction have been started and no more operations exist.