diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2006-10-27 16:38:12 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2006-10-27 16:38:12 +0200 |
| commit | d7dc169ea06552922f922dcf709eda90f1d46798 (patch) | |
| tree | ce8805d254bb9bddeb6c2af072af8098c781eafe /storage | |
| parent | 60b5420bff1f9d8cb4dd691df8ea3c6c25a36a4a (diff) | |
| parent | bd6203d528fe129957b5b187ec5ca6b45a615065 (diff) | |
| download | mariadb-git-d7dc169ea06552922f922dcf709eda90f1d46798.tar.gz | |
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
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/ndb/src/ndbapi/NdbTransaction.cpp | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/storage/ndb/src/ndbapi/NdbTransaction.cpp b/storage/ndb/src/ndbapi/NdbTransaction.cpp index 1801f2e55a9..0cbd67a38f6 100644 --- a/storage/ndb/src/ndbapi/NdbTransaction.cpp +++ b/storage/ndb/src/ndbapi/NdbTransaction.cpp @@ -366,7 +366,29 @@ 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 |