Commit 0f6a24ad authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main 

into  mysql.com:/home/stewart/Documents/MySQL/5.0/bugsmerge


ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
parents 375a1894 773e91d5

ndb/include/util/ConfigValues.hpp

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ public: 
public:

  ConfigValuesFactory(Uint32 keys = 50, Uint32 data = 10); // Initial

  ConfigValuesFactory(ConfigValues * m_cfg);        //

  ~ConfigValuesFactory();



  ConfigValues * m_cfg;

  ConfigValues * getConfigValues();

ndb/src/common/util/ConfigValues.cpp

+7 −1
Original line number Diff line number Diff line
@@ -294,6 +294,12 @@ ConfigValuesFactory::ConfigValuesFactory(ConfigValues * cfg){ 
  }

}



ConfigValuesFactory::~ConfigValuesFactory()

{

  if(m_cfg)

    free(m_cfg);

}



ConfigValues *

ConfigValuesFactory::create(Uint32 keys, Uint32 data){

  Uint32 sz = sizeof(ConfigValues);
@@ -528,7 +534,7 @@ ConfigValuesFactory::extractCurrentSection(const ConfigValues::ConstIterator & c 
    }

  }

  

  ConfigValues * ret = fac->m_cfg;

  ConfigValues * ret = fac->getConfigValues();

  delete fac;

  return ret;

}

ndb/src/mgmapi/mgmapi.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1945,7 +1945,7 @@ ndb_mgm_get_configuration(NdbMgmHandle handle, unsigned int version) { 
    }



    delete prop;

    return (ndb_mgm_configuration*)cvf.m_cfg;

    return (ndb_mgm_configuration*)cvf.getConfigValues();

  } while(0);



  delete prop;

ndb/src/mgmsrv/ConfigInfo.cpp

+5 −4
Original line number Diff line number Diff line
@@ -2241,10 +2241,10 @@ ConfigInfo::ConfigInfo() 
    if (!m_info.getCopy(param._section, &section)) {

      Properties newsection(true);

      m_info.put(param._section, &newsection);

    }



      // Get copy of section

      m_info.getCopy(param._section, &section);

    }



    // Create pinfo (parameter info) entry 

    Properties pinfo(true);
@@ -2299,6 +2299,7 @@ ConfigInfo::ConfigInfo() 


    // Replace section with modified section

    m_info.put(param._section, section, true);

    delete section;

    

    if(param._type != ConfigInfo::CI_SECTION){

      Properties * p;

ndb/src/mgmsrv/MgmtSrvr.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1863,7 +1863,7 @@ MgmtSrvr::handleReceivedSignal(NdbApiSignal* signal) 
    break;

  case GSN_EVENT_REP:

  {

    EventReport *rep = CAST_PTR(EventReport, signal->getDataPtrSend());

    EventReport *rep = (EventReport*) signal->getDataPtr();

    if (rep->getNodeId() == 0)

      rep->setNodeId(refToNode(signal->theSendersBlockRef));

    eventReport(signal->getDataPtr());