Commit 38910a86 authored by unknown's avatar unknown
Browse files

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

into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
parents 4d0b2435 2acf07aa

storage/ndb/src/ndbapi/NdbScanOperation.cpp

+2 −2
Original line number Diff line number Diff line
@@ -701,7 +701,7 @@ void NdbScanOperation::close(bool forceSend, bool releaseOp) 
  theNdbCon = NULL;

  m_transConnection = NULL;



  if (tTransCon) 

  if (tTransCon && releaseOp) 

  {

    NdbIndexScanOperation* tOp = (NdbIndexScanOperation*)this;
@@ -716,7 +716,7 @@ void NdbScanOperation::close(bool forceSend, bool releaseOp) 
					&tTransCon->m_theLastScanOperation,

					tOp);

    }

    else if (releaseOp)

    else

    {

      ret = tTransCon->releaseScanOperation(&tTransCon->m_firstExecutedScanOp,

					    0, tOp);