Skip to content

M
MariaDB
Commit d0bd8a8a authored by jonas@perch.ndb.mysql.com's avatar jonas@perch.ndb.mysql.com
Browse files
Options

ndb - fix memleak (due to incorrect merge of bug#21941) 

  recommit into release-clone
parent 930be00d
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
storage/ndb/src/ndbapi/NdbScanOperation.cpp
View file @ d0bd8a8a
...@@ -701,7 +701,7 @@ void NdbScanOperation::close(bool forceSend, bool releaseOp) ...@@ -701,7 +701,7 @@ void NdbScanOperation::close(bool forceSend, bool releaseOp)
theNdbCon = NULL; theNdbCon = NULL;
m_transConnection = NULL; m_transConnection = NULL;
if (tTransCon) if (tTransCon && releaseOp)
{ {
NdbIndexScanOperation* tOp = (NdbIndexScanOperation*)this; NdbIndexScanOperation* tOp = (NdbIndexScanOperation*)this;
...@@ -716,7 +716,7 @@ void NdbScanOperation::close(bool forceSend, bool releaseOp) ...@@ -716,7 +716,7 @@ void NdbScanOperation::close(bool forceSend, bool releaseOp)
&tTransCon->m_theLastScanOperation, &tTransCon->m_theLastScanOperation,
tOp); tOp);
} }
else if (releaseOp) else
{ {
ret = tTransCon->releaseScanOperation(&tTransCon->m_firstExecutedScanOp, ret = tTransCon->releaseScanOperation(&tTransCon->m_firstExecutedScanOp,
0, tOp); 0, tOp);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7