bk commit into 5.0 tree (root:1.2243) BUG#20848

[dli]

Below is the list of changes that have just been committed into a local
5.0 repository of root. When root 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-08 12:23:36+08:00, root@dev3-76.(none) +1 -0
  bug#20848.

  sql/ha_ndbcluster.cc@stripped, 2006-08-08 11:22:12+08:00, root@dev3-76.(none) +12 -3
    fixed bug#20848.

# 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:	root
# Host:	dev3-76.(none)
# Root:	/home/lisj/mysql/bug-20848

--- 1.273/sql/ha_ndbcluster.cc	2006-08-08 12:23:42 +08:00
+++ 1.274/sql/ha_ndbcluster.cc	2006-08-08 12:23:42 +08:00
@@ -146,7 +146,10 @@
 static const char * ndb_connected_host= 0;
 static long ndb_connected_port= 0;
 static long ndb_number_of_replicas= 0;
-static long ndb_number_of_storage_nodes= 0;
+// modified by david.li on 20060807 ---- begin
+//static long ndb_number_of_storage_nodes= 0;
+static long ndb_number_of_data_nodes= 0;
+// modified by david.li on 20060807 ---- end
 
 static int update_status_variables(Ndb_cluster_connection *c)
 {
@@ -154,7 +157,10 @@
   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();
+// modified by david.li on 20060807 ---- begin
+  //ndb_number_of_storage_nodes= c->no_db_nodes();
+  ndb_number_of_data_nodes= c->no_db_nodes();
+// modified by david.li on 20060807 ---- end
   return 0;
 }
 
@@ -163,7 +169,10 @@
   {"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},
+// modified by david.li on 20060807 ---- begin
+//  {"number_of_storage_nodes",(char*) &ndb_number_of_storage_nodes, SHOW_LONG},
+  {"number_of_data_nodes",(char*) &ndb_number_of_data_nodes, SHOW_LONG},
+// modified by david.li on 20060807 ---- end
   {NullS, NullS, SHOW_LONG}
 };