Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
This commit is contained in:
commit
3b726b2845
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user