Commit b0879d73 authored by unknown's avatar unknown
Browse files

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

into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
parents bd502ac6 9f247e56

ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp

+1 −1
Original line number Diff line number Diff line
@@ -75,8 +75,8 @@ static BlockInfo ALL_BLOCKS[] = { 
  { DBDICT_REF,  1 ,  6000,  6003 },

  { NDBFS_REF,   0 ,  2000,  2999 },

  { NDBCNTR_REF, 0 ,  1000,  1999 },

  { CMVMI_REF,   1 ,  9000,  9999 }, // before QMGR

  { QMGR_REF,    1 ,     1,   999 },

  { CMVMI_REF,   1 ,  9000,  9999 },

  { TRIX_REF,    1 ,     0,     0 },

  { BACKUP_REF,  1 , 10000, 10999 },

  { DBUTIL_REF,  1 , 11000, 11999 },

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