Commit 1fca3549 authored by unknown's avatar unknown
Browse files

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

into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/mysql-5.0-ndb-bj


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
parents f32014a9 25a7bd9e

ndb/src/mgmsrv/ConfigInfo.cpp

+9 −2
Original line number Diff line number Diff line
@@ -2604,6 +2604,13 @@ transformNode(InitConfigFileParser::Context & ctx, const char * data){ 
    return false;

  }



  if(id >= MAX_NODES)

  {

    ctx.reportError("too many nodes configured, only up to %d nodes supported.",

            MAX_NODES);

    return false;

  } 



  // next node id _always_ next numbers after last used id

  ctx.m_userProperties.put("NextNodeId", id+1, true);
@@ -3495,11 +3502,11 @@ sanity_checks(Vector<ConfigInfo::ConfigRuleSection>&sections, 
  Uint32 mgm_nodes = 0;

  Uint32 api_nodes = 0;

  if (!ctx.m_userProperties.get("DB", &db_nodes)) {

    ctx.reportError("At least one database node should be defined in config file");

    ctx.reportError("At least one database node (ndbd) should be defined in config file");

    return false;

  }

  if (!ctx.m_userProperties.get("MGM", &mgm_nodes)) {

    ctx.reportError("At least one management server node should be defined in config file");

    ctx.reportError("At least one management server node (ndb_mgmd) should be defined in config file");

    return false;

  }

  if (!ctx.m_userProperties.get("API", &api_nodes)) {

ndb/src/mgmsrv/MgmtSrvr.cpp

+4 −1
Original line number Diff line number Diff line
@@ -449,7 +449,10 @@ MgmtSrvr::MgmtSrvr(SocketServer *socket_server, 
    // read config locally

    _config= readConfig();

    if (_config == 0) {

      ndbout << "Unable to read config file" << endl;

      if (config_filename != NULL)

        ndbout << "Invalid configuration file: " << config_filename << endl;

      else

        ndbout << "Invalid configuration file" << endl;

      exit(-1);

    }

  }

sql/ha_ndbcluster.cc

+3 −3
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static long ndb_cluster_node_id= 0; 
static const char * ndb_connected_host= 0;

static long ndb_connected_port= 0;

static long ndb_number_of_replicas= 0;

static long ndb_number_of_storage_nodes= 0;

static long ndb_number_of_data_nodes= 0;



static int update_status_variables(Ndb_cluster_connection *c)

{
@@ -154,7 +154,7 @@ static int update_status_variables(Ndb_cluster_connection *c) 
  ndb_connected_port=          c->get_connected_port();

  ndb_connected_host=          c->get_connected_host();

  ndb_number_of_replicas=      0;

  ndb_number_of_storage_nodes= c->no_db_nodes();

  ndb_number_of_data_nodes= c->no_db_nodes();

  return 0;

}
@@ -163,7 +163,7 @@ struct show_var_st ndb_status_variables[]= { 
  {"config_from_host",         (char*) &ndb_connected_host,      SHOW_CHAR_PTR},

  {"config_from_port",         (char*) &ndb_connected_port,          SHOW_LONG},

//  {"number_of_replicas",     (char*) &ndb_number_of_replicas,      SHOW_LONG},

  {"number_of_storage_nodes",(char*) &ndb_number_of_storage_nodes, SHOW_LONG},

  {"number_of_data_nodes",(char*) &ndb_number_of_data_nodes, SHOW_LONG},

  {NullS, NullS, SHOW_LONG}

};