bk commit into 5.1 tree (stewart:1.2233)

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2233 06/06/28 22:16:04 stewart@willster.(none) +2 -0
  Merge mysql.com:/home/stewart/Documents/MySQL/5.1/ndb
  into  mysql.com:/home/stewart/Documents/MySQL/5.1/merge

  storage/ndb/src/mgmsrv/ConfigInfo.cpp
    1.80 06/06/28 22:15:59 stewart@willster.(none) +0 -0
    Auto merged

  sql/ha_ndbcluster.cc
    1.342 06/06/28 22:15:59 stewart@willster.(none) +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.1/merge/RESYNC

--- 1.79/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2006-06-28 16:41:32 +10:00
+++ 1.80/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2006-06-28 22:15:59 +10:00
@@ -878,7 +878,7 @@
     false,
     ConfigInfo::CI_INT,
     "8",
-    "1",
+    "3",
     STR_VALUE(MAX_INT_RNIL) },
 
   {

--- 1.341/sql/ha_ndbcluster.cc	2006-06-28 16:41:31 +10:00
+++ 1.342/sql/ha_ndbcluster.cc	2006-06-28 22:15:59 +10:00
@@ -186,8 +186,8 @@
 
 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}