diff options
| author | jonas@perch.ndb.mysql.com <> | 2006-10-27 23:54:57 +0200 |
|---|---|---|
| committer | jonas@perch.ndb.mysql.com <> | 2006-10-27 23:54:57 +0200 |
| commit | f4af143fcba6c61aa8d0823b8c97fcf09d7f6856 (patch) | |
| tree | 5339c7b59bd37ee69b52a44691d7e1859ad0182c /ndb | |
| parent | 7ad30e80f1054962eabe8b3502fc3a0c708b38bf (diff) | |
| parent | 85b0e1f80bb2523828ccbc4c03124eff29ccd9f9 (diff) | |
| download | mariadb-git-f4af143fcba6c61aa8d0823b8c97fcf09d7f6856.tar.gz | |
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/ndbapi/NdbConnection.cpp | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/ndb/src/ndbapi/NdbConnection.cpp b/ndb/src/ndbapi/NdbConnection.cpp index e061740c9f6..d5fa8f77db2 100644 --- a/ndb/src/ndbapi/NdbConnection.cpp +++ b/ndb/src/ndbapi/NdbConnection.cpp @@ -379,7 +379,29 @@ NdbConnection::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 |