Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-new

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new


storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged

1 files changed, 8 insertions, 0 deletions

diff --git a/storage/ndb/src/kernel/vm/Configuration.cpp b/storage/ndb/src/kernel/vm/Configuration.cpp
index 227ad6d6893..7ddea351bfd 100644
--- a/storage/ndb/src/kernel/vm/Configuration.cpp
+++ b/storage/ndb/src/kernel/vm/Configuration.cpp
@@ -210,9 +210,13 @@ Configuration::Configuration()
   m_config_retriever= 0;
   m_clusterConfig= 0;
   m_clusterConfigIter= 0;
+  m_logLevel= 0;
 }
 
 Configuration::~Configuration(){
+  if (opt_connect_str)
+    free(_connectString);
+
   if(_programName != NULL)
     free(_programName);
 
@@ -225,6 +229,10 @@ Configuration::~Configuration(){
   if (m_config_retriever) {
     delete m_config_retriever;
   }
+
+  if(m_logLevel) {
+    delete m_logLevel;
+  }
 }
 
 void