mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/home/jonas/src/mysql-4.1

Browse source 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
This commit is contained in:
joreland@mysql.com 2004-06-07 21:17:29 +02:00
commit f90ea9986a
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ndb/src/common/mgmcommon/ConfigInfo.cpp
View file

@ -2497,13 +2497,15 @@ fixNodeHostname(InitConfigFileParser::Context & ctx, const char * data){
ctx.reportError("Computer \"%s\" not declared"
"- [%s] starting at line: %d",
compId, ctx.fname, ctx.m_sectionLineno);
return false;
}
const char * hostname;
if(!computer->get("HostName", &hostname)){
ctx.reportError("HostName missing in [COMPUTER] Id: %s"
"- [%s] starting at line: %d",
ctx.reportError("HostName missing in [COMPUTER] (Id: %d) "
" - [%s] starting at line: %d",
compId, ctx.fname, ctx.m_sectionLineno);
return false;
}
require(ctx.m_currentSection->put("HostName", hostname));

4
ndb/src/common/util/ConfigValues.cpp
View file

@ -193,7 +193,7 @@ ConfigValues::Iterator::set(Uint32 key, const char * value){
char * & str = m_cfg.getString(m_cfg.m_values[pos+1]);
free(str);
str = strdup(value);
str = strdup(value ? value : "");
return true;
}
@ -457,7 +457,7 @@ ConfigValuesFactory::put(const ConfigValues::Entry & entry){
case ConfigValues::StringType:{
Uint32 index = m_cfg->m_stringCount++;
m_cfg->m_values[pos+1] = index;
m_cfg->getString(index) = strdup(entry.m_string);
m_cfg->getString(index) = strdup(entry.m_string ? entry.m_string : "");
m_freeKeys--;
m_freeData -= sizeof(char *);
DEBUG printf("Putting at: %d(%d) (loop = %d) key: %d value(%d): %s\n",