bzr commit into mysql-5.1 branch (msvensson:3081) WL#4350

[Magnus Svensson]

#At file:///home/msvensson/mysql/6.4-wl4350/

 3081 Magnus Svensson	2008-11-13
      WL#4350 Free memory allocated by load_defaults
modified:
  storage/ndb/src/mgmsrv/main.cpp

=== modified file 'storage/ndb/src/mgmsrv/main.cpp'
--- a/storage/ndb/src/mgmsrv/main.cpp	2008-11-13 08:00:21 +0000
+++ b/storage/ndb/src/mgmsrv/main.cpp	2008-11-13 12:10:52 +0000
@@ -136,12 +136,16 @@ static void usage()
   ndb_usage(short_usage_sub, load_default_groups, my_long_options);
 }
 
+static char **defaults_argv;
 
 static void
 mgmd_exit(int result)
 {
   g_eventLogger->close();
 
+  /* Free memory allocated by 'load_defaults' */
+  free_defaults(defaults_argv);
+
   ndb_end(opt_ndb_endinfo ? MY_CHECK_ERROR | MY_GIVE_INFO : 0);
 
   exit(result);
@@ -157,6 +161,7 @@ int main(int argc, char** argv)
   ndb_opt_set_usage_funcs(NULL, short_usage_sub, usage);
 
   load_defaults("my",load_default_groups,&argc,&argv);
+  defaults_argv= argv; /* Must be freed by 'free_defaults' */
 
   int ho_error;
 #ifndef DBUG_OFF