mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge perch.ndb.mysql.com:/home/jonas/src/50-work

Browse source 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
This commit is contained in:
jonas@perch.ndb.mysql.com 2006-10-12 18:58:52 +02:00
commit a54087870c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
storage/ndb/src/ndbapi/NdbScanOperation.cpp
View file

@ -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)
&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);