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

into mysql.com:/home/jonas/src/mysql-4.1-ndb

ndb/src/common/mgmcommon/ConfigInfo.cpp

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

ndb/src/common/util/ConfigValues.cpp

@@ -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",