Commit 9f247e56 authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/50-work 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
parents 363e4b27 0e39133a

ndb/src/mgmsrv/InitConfigFileParser.cpp

+7 −6
Original line number Diff line number Diff line
@@ -799,6 +799,7 @@ InitConfigFileParser::parse_mycnf() 
  /**

   * Add ndbd, ndb_mgmd, api/mysqld

   */

  Uint32 idx = options.size();

  {

    struct my_option opt;

    bzero(&opt, sizeof(opt));
@@ -808,7 +809,6 @@ InitConfigFileParser::parse_mycnf() 
    opt.var_type = GET_STR;

    opt.arg_type = REQUIRED_ARG;

    options.push_back(opt);

    ndbd = &options.back();



    opt.name = "ndb_mgmd";

    opt.id = 256;
@@ -816,7 +816,6 @@ InitConfigFileParser::parse_mycnf() 
    opt.var_type = GET_STR;

    opt.arg_type = REQUIRED_ARG;

    options.push_back(opt);

    ndb_mgmd = &options.back();



    opt.name = "mysqld";

    opt.id = 256;
@@ -824,20 +823,22 @@ InitConfigFileParser::parse_mycnf() 
    opt.var_type = GET_STR;

    opt.arg_type = REQUIRED_ARG;

    options.push_back(opt);

    mysqld = &options.back();



    opt.name = "api";

    opt.name = "ndbapi";

    opt.id = 256;

    opt.value = (gptr*)malloc(sizeof(char*));

    opt.var_type = GET_STR;

    opt.arg_type = REQUIRED_ARG;

    options.push_back(opt);

    api = &options.back();



    bzero(&opt, sizeof(opt));

    options.push_back(opt);

  }



    ndbd = &options[idx];

    ndb_mgmd = &options[idx+1];

    mysqld = &options[idx+2];

    api = &options[idx+3];

  }

  

  Context ctx(m_info, m_errstream); 

  const char *groups[]= { "cluster_config", 0 };