Commit eb1d1202 authored by unknown's avatar unknown

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
...@@ -357,8 +357,15 @@ NdbTransaction::execute(ExecType aTypeOfExec, ...@@ -357,8 +357,15 @@ NdbTransaction::execute(ExecType aTypeOfExec,
ret = -1; ret = -1;
if(savedError.code==0) if(savedError.code==0)
savedError= theError; 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 #ifdef ndb_api_crash_on_complex_blob_abort
assert(theFirstOpInList == NULL && theLastOpInList == NULL); assert(theFirstOpInList == NULL && theLastOpInList == NULL);
#else #else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment