bk commit into 5.0 tree (stewart:1.2249) BUG#21671

[Stewart Smith]

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@stripped, 2006-08-16 14:39:27+08:00, stewart@willster.(none) +1 -0
  BUG#21671 memory leak for mgmapi event listeners
  
  fixes the following valgrind warning (when running ndb_mgm under valgrind,
  or, indeed any other mgmapi program listening to events):
  
  ==23291== 190 (20 direct, 170 indirect) bytes in 1 blocks are definitely lost in loss record 13 of 22
  ==23291==    at 0x401C895: operator new(unsigned) (vg_replace_malloc.c:163)
  ==23291==    by 0x8075300: ParserImpl::run(Parser<ParserImpl::Dummy>::Context*, Properties const**, bool volatile*) const (Parser.cpp:178)
  ==23291==    by 0x806D09B: Parser<ParserDummy>::parse(Parser<ParserDummy>::Context&, ParserDummy&) (Parser.hpp:219)
  ==23291==    by 0x80671C4: ndb_mgm_call(ndb_mgm_handle*, ParserRow<ParserDummy> const*, char const*, Properties const*) (mgmapi.cpp:355)
  ==23291==    by 0x806AB79: ndb_mgm_listen_event_internal(ndb_mgm_handle*, int const*, int) (mgmapi.cpp:1419)
  ==23291==    by 0x806AC1F: ndb_mgm_listen_event (mgmapi.cpp:1434)
  ==23291==    by 0x805EB5D: event_thread_run(void*) (CommandInterpreter.cpp:467)
  ==23291==    by 0x806F70A: ndb_thread_wrapper (NdbThread.c:68)
  ==23291==    by 0x4042340: start_thread (in /lib/tls/i686/cmov/libpthread-2.3.6.so)
  ==23291==    by 0x429D4ED: clone (in /lib/tls/i686/cmov/libc-2.3.6.so)

  ndb/src/mgmapi/mgmapi.cpp@stripped, 2006-08-16 14:39:24+08:00, stewart@willster.(none) +6 -5
    fix memory leak for mgmapi event listeners (1 per connect)
    
    (missing delete of reply Properties object returned by ndb_mgm_call)

# 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/ndb

--- 1.60/ndb/src/mgmapi/mgmapi.cpp	2006-08-16 14:39:32 +08:00
+++ 1.61/ndb/src/mgmapi/mgmapi.cpp	2006-08-16 14:39:32 +08:00
@@ -1389,7 +1389,7 @@
     MGM_END()
   };
   CHECK_HANDLE(handle, -1);
-  
+
   const char *hostname= ndb_mgm_get_connected_host(handle);
   int port= ndb_mgm_get_connected_port(handle);
   SocketClient s(hostname, port);
@@ -1411,19 +1411,20 @@
     }
     args.put("filter", tmp.c_str());
   }
-  
+
   int tmp = handle->socket;
   handle->socket = sockfd;
-  
+
   const Properties *reply;
   reply = ndb_mgm_call(handle, stat_reply, "listen event", &args);
-  
+
   handle->socket = tmp;
-  
+
   if(reply == NULL) {
     close(sockfd);
     CHECK_REPLY(reply, -1);
   }
+  delete reply;
   return sockfd;
 }