Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged

storage/ndb/src/ndbapi/NdbTransaction.cpp

@@ -366,8 +366,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);