bk commit into 5.1 tree (tomas:1.2582) BUG#35573

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas.  When tomas 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, 2008-04-09 15:52:09+02:00, tomas@stripped +3 -0
  Bug#35573 [Com,!Bg->Ver]: ndb-cluster-connection-pool not visible in global variables

  sql/ha_ndbcluster.cc@stripped, 2008-04-09 15:52:07+02:00, tomas@stripped +1 -0
    Bug#35573 [Com,!Bg->Ver]: ndb-cluster-connection-pool not visible in global variables

  sql/ha_ndbcluster_connection.cc@stripped, 2008-04-09 15:52:07+02:00, tomas@stripped +0 -1
    Bug#35573 [Com,!Bg->Ver]: ndb-cluster-connection-pool not visible in global variables

  sql/ha_ndbcluster_connection.h@stripped, 2008-04-09 15:52:07+02:00, tomas@stripped +3 -0
    Bug#35573 [Com,!Bg->Ver]: ndb-cluster-connection-pool not visible in global variables

diff -Nrup a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
--- a/sql/ha_ndbcluster.cc	2008-04-04 14:41:21 +02:00
+++ b/sql/ha_ndbcluster.cc	2008-04-09 15:52:07 +02:00
@@ -202,6 +202,7 @@ SHOW_VAR ndb_status_variables[]= {
   {"config_from_port",    (char*) &g_ndb_status.connected_port,       SHOW_LONG},
 //{"number_of_replicas",  (char*) &g_ndb_status.number_of_replicas,   SHOW_LONG},
   {"number_of_data_nodes",(char*) &g_ndb_status.number_of_data_nodes, SHOW_LONG},
+  {"cluster_connection_pool",(char*) &opt_ndb_cluster_connection_pool, SHOW_LONG},
   {NullS, NullS, SHOW_LONG}
 };
 
diff -Nrup a/sql/ha_ndbcluster_connection.cc b/sql/ha_ndbcluster_connection.cc
--- a/sql/ha_ndbcluster_connection.cc	2008-02-22 13:29:07 +01:00
+++ b/sql/ha_ndbcluster_connection.cc	2008-04-09 15:52:07 +02:00
@@ -28,7 +28,6 @@
 extern my_bool opt_ndb_optimized_node_selection;
 extern const char *opt_ndbcluster_connectstring;
 extern ulong opt_ndb_wait_connected;
-extern ulong opt_ndb_cluster_connection_pool;
 
 Ndb* g_ndb= NULL;
 Ndb_cluster_connection* g_ndb_cluster_connection= NULL;
diff -Nrup a/sql/ha_ndbcluster_connection.h b/sql/ha_ndbcluster_connection.h
--- a/sql/ha_ndbcluster_connection.h	2007-11-20 15:22:02 +01:00
+++ b/sql/ha_ndbcluster_connection.h	2008-04-09 15:52:07 +02:00
@@ -20,3 +20,6 @@ Ndb_cluster_connection *ndb_get_cluster_
 ulonglong ndb_get_latest_trans_gci();
 void ndb_set_latest_trans_gci(ulonglong val);
 int ndb_has_node_id(uint id);
+
+/* options from from mysqld.cc */
+extern ulong opt_ndb_cluster_connection_pool;