Commit 65d9e36f authored by unknown's avatar unknown
Browse files

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

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
parents f14bb14c 34f1f0b5

mysql-test/t/disabled.def

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
events_bugs              : BUG#17619 2006-02-21 andrey  Race conditions

events_stress            : BUG#17619 2006-02-21 andrey  Race conditions

events                   : BUG#17619 2006-02-21 andrey  Race conditions

events_scheduling        : BUG#19170 2006-04-26 andrey  Test case of 19170 fails on some platforms. Has to be checked.

ndb_autodiscover         : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog

ndb_autodiscover2        : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog

#ndb_cache2               : BUG#18597 2006-03-28 brian simultaneous drop table and ndb statistics update triggers node failure

storage/ndb/src/kernel/vm/Configuration.cpp

+8 −0
Original line number Diff line number Diff line
@@ -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