Commit ba583978 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/ndbapi/NdbTransaction.cpp:
  Auto merged
parents 65f50416 11ac4907

ndb/src/ndbapi/NdbTransaction.cpp

+22 −0
Original line number Diff line number Diff line
@@ -363,8 +363,30 @@ NdbTransaction::execute(ExecType aTypeOfExec, 
       *   operations, making postExecute impossible

       */

      if (abortOption == AO_IgnoreError)

      {

         if (theCompletedFirstOp != NULL)

	 {

	   if (tCompletedFirstOp != NULL)

	   {

	     tCompletedLastOp->next(theCompletedFirstOp);

	     theCompletedFirstOp = tCompletedFirstOp;

	   } 

	 }

	 else

	 {

	   theCompletedFirstOp = tCompletedFirstOp;

	   theCompletedLastOp = tCompletedLastOp;

	 }

         if (tPrepOp != NULL && tRestOp != NULL) {

           if (theFirstOpInList == NULL)

             theFirstOpInList = tRestOp;

           else

             theLastOpInList->next(tRestOp);

           theLastOpInList = tLastOp;

        }

	DBUG_RETURN(-1);

      }

    }

    

#ifdef ndb_api_crash_on_complex_blob_abort

    assert(theFirstOpInList == NULL && theLastOpInList == NULL);