bk commit into 5.1 tree (justin.he:1.2274)

[jhe]

Below is the list of changes that have just been committed into a local
5.1 repository of justin.he. When justin.he 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@stripped, 2006-08-11 15:18:40+08:00, justin.he@stripped +1 -0
  Merge qa3-104.qa.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.0-ndb-bj
  into  qa3-104.qa.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.1-ndb-bj
  MERGE: 1.1810.1696.112

  sql/ha_ndbcluster.cc@stripped, 2006-08-11 15:18:33+08:00, justin.he@stripped +3 -5
    manual merge
    MERGE: 1.175.1.99

# 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:	justin.he
# Host:	qa3-104.qa.cn.tlan
# Root:	/mnt/sda7/justin.he/mysql/mysql-5.1-ndb-bj/RESYNC

--- 1.347/sql/ha_ndbcluster.cc	2006-08-11 15:18:56 +08:00
+++ 1.348/sql/ha_ndbcluster.cc	2006-08-11 15:18:56 +08:00
@@ -168,8 +168,8 @@
 static const char * ndb_connected_host= 0;
 static long ndb_connected_port= 0;
 static long ndb_number_of_replicas= 0;
-long ndb_number_of_storage_nodes= 0;
-long ndb_number_of_ready_storage_nodes= 0;
+long ndb_number_of_data_nodes= 0;
+long ndb_number_of_ready_data_nodes= 0;
 long ndb_connect_count= 0;
 
 static int update_status_variables(Ndb_cluster_connection *c)
@@ -178,8 +178,7 @@
   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_ready_storage_nodes= c->get_no_ready();
+  ndb_number_of_ready_data_nodes= c->get_no_ready();
   ndb_connect_count= c->get_connect_count();
   return 0;
 }
@@ -189,7 +188,7 @@
   {"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}
 };