Commit 2acf07aa authored by unknown's avatar unknown

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
parent 2f3ac777
...@@ -678,7 +678,7 @@ void NdbScanOperation::close(bool forceSend, bool releaseOp) ...@@ -678,7 +678,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;
...@@ -693,7 +693,7 @@ void NdbScanOperation::close(bool forceSend, bool releaseOp) ...@@ -693,7 +693,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