diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2006-10-27 16:34:22 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2006-10-27 16:34:22 +0200 |
| commit | ba583978eaa991ed5c69d36901fe9d7ce0bd599f (patch) | |
| tree | dcf3502224979f8c203d16a8858d7e970f472397 /ndb | |
| parent | 65f50416f588f5a2a38a6358b12ea263f2bfca43 (diff) | |
| parent | 11ac49077938893be01273e848eb7cdbae0ab409 (diff) | |
| download | mariadb-git-ba583978eaa991ed5c69d36901fe9d7ce0bd599f.tar.gz | |
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
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/ndbapi/NdbTransaction.cpp | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/ndb/src/ndbapi/NdbTransaction.cpp b/ndb/src/ndbapi/NdbTransaction.cpp index f219b74f896..6ce9cbab199 100644 --- a/ndb/src/ndbapi/NdbTransaction.cpp +++ b/ndb/src/ndbapi/NdbTransaction.cpp @@ -363,7 +363,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 |