Commit 92dfd1bf authored by unknown's avatar unknown
Browse files

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

into poseidon.(none):/home/tomas/mysql-4.1-clean
parents 5b1c2dec b7a13b55

ndb/src/common/mgmcommon/ConfigInfo.cpp

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ 
const ConfigInfo::AliasPair

ConfigInfo::m_sectionNameAliases[]={

  {"API", "MYSQLD"},

  {"DB", "NDBD"},

  {"MGM", "NDB_MGMD"},

  {0, 0}

};

ndb/src/common/mgmcommon/InitConfigFileParser.cpp

+3 −3
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ bool InitConfigFileParser::parseNameValuePair(Context& ctx, const char* line) { 
  char tmpLine[MAX_LINE_LENGTH];

  char fname[MAX_LINE_LENGTH], rest[MAX_LINE_LENGTH];

  char* t;

  const char *separator_list[]= {":", "="};

  const char *separator_list[]= {":", "=", 0};

  const char *separator= 0;



  if (ctx.m_currentSection == NULL){
@@ -235,7 +235,7 @@ bool InitConfigFileParser::parseNameValuePair(Context& ctx, const char* line) { 
  // *************************************

  //  Check if a separator exists in line 

  // *************************************

  for(int i= 0; i < sizeof(separator_list); i++) {

  for(int i= 0; separator_list[i] != 0; i++) {

    if(strchr(tmpLine, separator_list[i][0])) {

      separator= separator_list[i];

      break;
@@ -522,7 +522,7 @@ InitConfigFileParser::parseDefaultSectionHeader(const char* line) const { 
  if (no != 2) return NULL;



  // Not correct keyword at end

  if (!strcmp(token2, "DEFAULT") == 0) return NULL;

  if (!strcasecmp(token2, "DEFAULT") == 0) return NULL;



  if(m_info->getInfo(token1)){

    return strdup(token1);