Commit eb1d1202 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 a4a651e1 1028185a

ndb/src/ndbapi/NdbTransaction.cpp

+8 −1
Original line number Diff line number Diff line
@@ -357,6 +357,13 @@ NdbTransaction::execute(ExecType aTypeOfExec, 
      ret = -1;

      if(savedError.code==0)

	savedError= theError;

      

      /**

       * If AO_IgnoreError, error codes arent always set on individual

       *   operations, making postExecute impossible

       */

      if (abortOption == AO_IgnoreError)

	DBUG_RETURN(-1);

    }

    

#ifdef ndb_api_crash_on_complex_blob_abort