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

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

Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into perch.ndb.mysql.com:/home/jonas/src/50-work
deb9a3cc · jonas@perch.ndb.mysql.com · 0d534b57 · bacb71d6 · deb9a3cc
Commit deb9a3cc authored Oct 19, 2006 by jonas@perch.ndb.mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

ndb/src/ndbapi/NdbTransaction.cpp ndb/src/ndbapi/NdbTransaction.cpp +8 -1

No files found.
--- a/ndb/src/ndbapi/NdbTransaction.cpp
+++ b/ndb/src/ndbapi/NdbTransaction.cpp
@@ -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