From: Date: April 7 2006 5:11pm
Subject: bk commit into 5.0 tree (jonas:1.2141) BUG#11034
List-Archive: http://lists.mysql.com/commits/4649
X-Bug: 11034
Message-Id: <20060407151101.5D4E33706D2@perch.ndb.mysql.com>

Below is the list of changes that have just been committed into a local
5.0 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
  1.2141 06/04/07 17:10:56 jonas@stripped +1 -0
  ndb - bug#11034
    fix mem leak (not during running of transactions, but a few bytes when shutting down)

  ndb/src/ndbapi/NdbLinHash.hpp
    1.6 06/04/07 17:10:54 jonas@stripped +10 -3
    Make sure that getNext(0) actually finds first element

# 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/50-work

--- 1.5/ndb/src/ndbapi/NdbLinHash.hpp	2005-06-02 14:32:01 +02:00
+++ 1.6/ndb/src/ndbapi/NdbLinHash.hpp	2006-04-07 17:10:54 +02:00
@@ -427,19 +427,26 @@
     return curr->next;
   
   int dir = 0, seg = 0;
-
-  if(curr != 0){
+  int counts;
+  if(curr != 0)
+  {
     getBucket(curr->hash, &dir, &seg);
+    counts = seg + 1;
+  }
+  else
+  {
+    counts = 0;
   }
   
   for(int countd = dir; countd < DIRECTORYSIZE;countd++ ){
     if (directory[countd] != 0) {
-      for(int counts = seg + 1; counts < SEGMENTSIZE; counts++ ){
+      for(; counts < SEGMENTSIZE; counts++ ){
 	if (directory[countd]->elements[counts] != 0) {
 	  return directory[countd]->elements[counts];
 	}   
       }
     }
+    counts = 0;
   }
 
   return 0;