From: Date: October 13 2006 10:11am
Subject: bk commit into 5.1 tree (jonas:1.2317) BUG#21941
List-Archive: http://lists.mysql.com/commits/13645
X-Bug: 21941
Message-Id: <20061013081123.571255AC8D5@perch.ndb.mysql.com>

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-10-13 10:11:18+02:00, jonas@stripped +1 -0
  ndb - fix memleak (due to incorrect merge of bug#21941)
    recommit into release-clone

  storage/ndb/src/ndbapi/NdbScanOperation.cpp@stripped, 2006-10-13 10:11:14+02:00, jonas@stripped +2 -2
    fix missing "if" statement

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.1-release

--- 1.97/storage/ndb/src/ndbapi/NdbScanOperation.cpp	2006-10-13 10:11:23 +02:00
+++ 1.98/storage/ndb/src/ndbapi/NdbScanOperation.cpp	2006-10-13 10:11:23 +02:00
@@ -701,7 +701,7 @@
   theNdbCon = NULL;
   m_transConnection = NULL;
 
-  if (tTransCon) 
+  if (tTransCon && releaseOp) 
   {
     NdbIndexScanOperation* tOp = (NdbIndexScanOperation*)this;
 
@@ -716,7 +716,7 @@
 					&tTransCon->m_theLastScanOperation,
 					tOp);
     }
-    else if (releaseOp)
+    else
     {
       ret = tTransCon->releaseScanOperation(&tTransCon->m_firstExecutedScanOp,
 					    0, tOp);