Commit 23669046 authored by unknown's avatar unknown

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new

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

parents d36a35a4 249ff249
...@@ -210,9 +210,13 @@ Configuration::Configuration() ...@@ -210,9 +210,13 @@ Configuration::Configuration()
m_config_retriever= 0; m_config_retriever= 0;
m_clusterConfig= 0; m_clusterConfig= 0;
m_clusterConfigIter= 0; m_clusterConfigIter= 0;
m_logLevel= 0;
} }
Configuration::~Configuration(){ Configuration::~Configuration(){
if (opt_connect_str)
free(_connectString);
if(_programName != NULL) if(_programName != NULL)
free(_programName); free(_programName);
...@@ -225,6 +229,10 @@ Configuration::~Configuration(){ ...@@ -225,6 +229,10 @@ Configuration::~Configuration(){
if (m_config_retriever) { if (m_config_retriever) {
delete m_config_retriever; delete m_config_retriever;
} }
if(m_logLevel) {
delete m_logLevel;
}
} }
void void
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment