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

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


ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

2 files changed, 3 insertions, 3 deletions

diff --git a/ndb/src/mgmsrv/ConfigInfo.cpp b/ndb/src/mgmsrv/ConfigInfo.cpp
index dfe4f9aa63e..629ddf7a655 100644
--- a/ndb/src/mgmsrv/ConfigInfo.cpp
+++ b/ndb/src/mgmsrv/ConfigInfo.cpp
@@ -853,7 +853,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
     false,
     ConfigInfo::CI_INT,
     "8",
-    "1",
+    "3",
     STR_VALUE(MAX_INT_RNIL) },
 
   {
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index ced85d1a339..927b60ed3fc 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -160,8 +160,8 @@ static int update_status_variables(Ndb_cluster_connection *c)
 
 struct show_var_st 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}