1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into  mysql.com:/home/stewart/Documents/MySQL/5.1/main


storage/ndb/include/util/ConfigValues.hpp:
  Auto merged
storage/ndb/src/common/util/ConfigValues.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  manual merge (n/a in 5.1)
This commit is contained in:
unknown 2006-06-20 17:33:14 +10:00
commit 008b1e5227
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
storage/ndb/include/util/ConfigValues.hpp
View File

@ -96,6 +96,7 @@ public:
public:
ConfigValuesFactory(Uint32 keys = 50, Uint32 data = 10); // Initial
ConfigValuesFactory(ConfigValues * m_cfg); //
~ConfigValuesFactory();
ConfigValues * m_cfg;
ConfigValues * getConfigValues();

8
storage/ndb/src/common/util/ConfigValues.cpp
View File

@ -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;
}

2
storage/ndb/src/mgmapi/mgmapi.cpp
View File

@ -1924,7 +1924,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;

9
storage/ndb/src/mgmsrv/ConfigInfo.cpp
View File

@ -2289,11 +2289,11 @@ 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);
}
// Get copy of section
m_info.getCopy(param._section, &section);
// Create pinfo (parameter info) entry
Properties pinfo(true);
pinfo.put("Id", param._paramId);
@ -2347,6 +2347,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;