diff options
author | unknown <jonas@perch.ndb.mysql.com> | 2006-10-12 18:55:22 +0200 |
---|---|---|
committer | unknown <jonas@perch.ndb.mysql.com> | 2006-10-12 18:55:22 +0200 |
commit | 2acf07aaef197fbc9d1fed490e7098a8572fc4c3 (patch) | |
tree | 3c6bcc23d848053640de5193273b8df4ff6756a5 /ndb | |
parent | 2f3ac777d825b3f92d1d9a9228d656cee2bc9fc5 (diff) | |
download | mariadb-git-2acf07aaef197fbc9d1fed490e7098a8572fc4c3.tar.gz |
ndb - missing if for bug#21941
note this does not happen in 5.0, but i'm committing it here to keep code same between 5.0 and 5.1
ndb/src/ndbapi/NdbScanOperation.cpp:
missing if for bug#21941
Diffstat (limited to 'ndb')
-rw-r--r-- | ndb/src/ndbapi/NdbScanOperation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ndb/src/ndbapi/NdbScanOperation.cpp b/ndb/src/ndbapi/NdbScanOperation.cpp index a644efe9406..628d7551a52 100644 --- a/ndb/src/ndbapi/NdbScanOperation.cpp +++ b/ndb/src/ndbapi/NdbScanOperation.cpp @@ -678,7 +678,7 @@ void NdbScanOperation::close(bool forceSend, bool releaseOp) theNdbCon = NULL; m_transConnection = NULL; - if (tTransCon) + if (tTransCon && releaseOp) { NdbIndexScanOperation* tOp = (NdbIndexScanOperation*)this; @@ -693,7 +693,7 @@ void NdbScanOperation::close(bool forceSend, bool releaseOp) &tTransCon->m_theLastScanOperation, tOp); } - else if (releaseOp) + else { ret = tTransCon->releaseScanOperation(&tTransCon->m_firstExecutedScanOp, 0, tOp); |