Commit 842ae81d authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/stewart/Documents/MySQL/5.1/ndb 

into  mysql.com:/home/stewart/Documents/MySQL/5.1/merge


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
parents 42f61262 7273e37d

sql/ha_ndbcluster.cc

+2 −2
Original line number Diff line number Diff line
@@ -186,8 +186,8 @@ static int update_status_variables(Ndb_cluster_connection *c) 


SHOW_VAR ndb_status_variables[]= {

  {"cluster_node_id",        (char*) &ndb_cluster_node_id,         SHOW_LONG},

  {"connected_host",         (char*) &ndb_connected_host,      SHOW_CHAR_PTR},

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

  {"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},

  {NullS, NullS, SHOW_LONG}

storage/ndb/src/mgmsrv/ConfigInfo.cpp

+1 −1
Original line number Diff line number Diff line
@@ -878,7 +878,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    false,

    ConfigInfo::CI_INT,

    "8",

    "1",

    "3",

    STR_VALUE(MAX_INT_RNIL) },



  {