bk commit into 5.1 tree (jonas:1.2412) BUG#24028

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-31 16:20:30+01:00, jonas@stripped +1 -0
  ndb - bug#24028
    minimal fix

  storage/ndb/src/ndbapi/NdbTransaction.cpp@stripped, 2007-01-31 16:20:26+01:00,
jonas@stripped +3 -3
    ndb - bug#24028
      minimal fix

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-telco

--- 1.74/storage/ndb/src/ndbapi/NdbTransaction.cpp	2007-01-31 16:20:36 +01:00
+++ 1.75/storage/ndb/src/ndbapi/NdbTransaction.cpp	2007-01-31 16:20:36 +01:00
@@ -361,10 +361,10 @@
 	savedError= theError;
       
       /**
-       * If AO_IgnoreError, error codes arent always set on individual
-       *   operations, making postExecute impossible
+       * If transaction is aborted, postExecute is impossible
        */
-      if (abortOption == AO_IgnoreError)
+      if (aTypeOfExec != Rollback && 
+	  (commitStatus() == Aborted || commitStatus() == NeedAbort))
       {
          if (theCompletedFirstOp != NULL)
 	 {