From: Date: October 14 2007 4:17pm
Subject: bk commit into 5.0 tree (pekka:1.2486) BUG#29390
List-Archive: http://lists.mysql.com/commits/35527
X-Bug: 29390
Message-Id: <20071014141742.7B08D23D60@sama.ndb.mysql.com>

Below is the list of changes that have just been committed into a local
5.0 repository of pekka. When pekka 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, 2007-10-14 16:17:39+02:00, pekka@stripped +1 -0
  ndb - bug#29390: fix mem leak introduced in previous cset

  ndb/src/ndbapi/NdbScanFilter.cpp@stripped, 2007-10-14 16:15:43+02:00, pekka@stripped +32 -0
    fix mem leak on discarded scanfilter

# 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:	pekka
# Host:	sama.ndb.mysql.com
# Root:	/export/space/pekka/ndb/version/my50-bug29390

--- 1.15/ndb/src/ndbapi/NdbScanFilter.cpp	2007-10-04 10:52:13 +02:00
+++ 1.16/ndb/src/ndbapi/NdbScanFilter.cpp	2007-10-14 16:15:43 +02:00
@@ -22,6 +22,7 @@
 #include <Interpreter.hpp>
 #include <signaldata/AttrInfo.hpp>
 #include "NdbApiSignal.hpp"
+#include "NdbUtil.hpp"
 
 #ifdef VM_TRACE
 #include <NdbEnv.h>
@@ -621,12 +622,43 @@
   op->theStatus = m_initial_op_status;
 
   // reset interpreter state to initial
+
+  NdbBranch* tBranch = op->theFirstBranch;
+  while (tBranch != NULL) {
+    NdbBranch* tmp = tBranch;
+    tBranch = tBranch->theNext;
+    op->theNdb->releaseNdbBranch(tmp);
+  }
   op->theFirstBranch = NULL;
   op->theLastBranch = NULL;
+
+  NdbLabel* tLabel = op->theFirstLabel;
+  while (tLabel != NULL) {
+    NdbLabel* tmp = tLabel;
+    tLabel = tLabel->theNext;
+    op->theNdb->releaseNdbLabel(tmp);
+  }
+  op->theFirstLabel = NULL;
+  op->theLastLabel = NULL;
+
+  NdbCall* tCall = op->theFirstCall;
+  while (tCall != NULL) {
+    NdbCall* tmp = tCall;
+    tCall = tCall->theNext;
+    op->theNdb->releaseNdbCall(tmp);
+  }
   op->theFirstCall = NULL;
   op->theLastCall = NULL;
+
+  NdbSubroutine* tSubroutine = op->theFirstSubroutine;
+  while (tSubroutine != NULL) {
+    NdbSubroutine* tmp = tSubroutine;
+    tSubroutine = tSubroutine->theNext;
+    op->theNdb->releaseNdbSubroutine(tmp);
+  }
   op->theFirstSubroutine = NULL;
   op->theLastSubroutine = NULL;
+
   op->theNoOfLabels = 0;
   op->theNoOfSubroutines = 0;