From: Date: April 25 2006 12:59am
Subject: bk commit into 5.0 tree (stewart:1.2094) BUG#19318
List-Archive: http://lists.mysql.com/commits/5439
X-Bug: 19318
Message-Id: <20060424225940.5AABD141BF6F@localhost.localdomain>

Below is the list of changes that have just been committed into a local
5.0 repository of stewart. When stewart 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.2094 06/04/24 15:59:34 stewart@stripped +2 -0
  BUG#19318 valgrind: memory leak in ndb_mgmd
  
  2nd part of the patch
  
  fix functions called by ndbd to deal with memory allocation properly. 

  ndb/src/mgmsrv/ConfigInfo.cpp
    1.72 06/04/24 15:59:30 stewart@stripped +1 -0
    clean up after ourselves in constructor

  ndb/src/mgmapi/mgmapi.cpp
    1.59 06/04/24 15:59:30 stewart@stripped +1 -1
    in get_configuration() - get a copy to return instead of just passing one back and loosing some memory

# 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:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.0/bug19318

--- 1.71/ndb/src/mgmsrv/ConfigInfo.cpp	2005-10-12 06:19:41 -07:00
+++ 1.72/ndb/src/mgmsrv/ConfigInfo.cpp	2006-04-24 15:59:30 -07:00
@@ -2344,6 +2344,7 @@
       ndbout << "Edit file " << __FILE__ << "." << endl;
       require(false);
     }
+    delete section;
   }
 }
 

--- 1.58/ndb/src/mgmapi/mgmapi.cpp	2006-02-13 03:58:03 -08:00
+++ 1.59/ndb/src/mgmapi/mgmapi.cpp	2006-04-24 15:59:30 -07:00
@@ -1808,7 +1808,7 @@
     }
 
     delete prop;
-    return (ndb_mgm_configuration*)cvf.m_cfg;
+    return (ndb_mgm_configuration*)cvf.getConfigValues();
   } while(0);
 
   delete prop;