bk commit into 5.1 tree (stewart:1.2229)

[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.2229 06/06/28 18:21:37 stewart@willster.(none) +1 -0
  Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bug11459
  into  mysql.com:/home/stewart/Documents/MySQL/5.1/merge

  sql/ha_ndbcluster.cc
    1.341 06/06/28 18:21:31 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.340/sql/ha_ndbcluster.cc	2006-06-28 06:19:17 +10:00
+++ 1.341/sql/ha_ndbcluster.cc	2006-06-28 18:21:31 +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}