bzr commit into mysql-5.1-telco-7.0 branch (msabaratnam:4237) Bug#60119

[Maitrayi Sabaratnam]

#At file:///export/home2/tmp/maitrayi/mysql-repo/repo-7.0/mysql-5.1-telco-7.0-bug60119/ based on revid:ole.john.aske@stripped

 4237 Maitrayi Sabaratnam	2011-03-01
      Bug#60119 ndb_cluster_connection_pool status variable value is too high

    modified:
      sql/ha_ndbcluster.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-02-28 13:46:09 +0000
+++ b/sql/ha_ndbcluster.cc	2011-03-01 16:42:40 +0000
@@ -544,11 +544,6 @@ SHOW_VAR ndb_status_variables_dynamic[]=
   {NullS, NullS, SHOW_LONG}
 };
 
-SHOW_VAR ndb_status_variables_fixed[]= {
-  {"cluster_connection_pool",(char*) &opt_ndb_cluster_connection_pool, SHOW_LONG},
-  {NullS, NullS, SHOW_LONG}
-};
-
 SHOW_VAR ndb_status_conflict_variables[]= {
   {"fn_max",     (char*) &g_ndb_status_conflict_fn_max, SHOW_LONG},
   {"fn_old",     (char*) &g_ndb_status_conflict_fn_old, SHOW_LONG},
@@ -15294,7 +15289,6 @@ static int show_ndb_vars(THD *thd, SHOW_
 
 SHOW_VAR ndb_status_variables_export[]= {
   {"Ndb",          (char*) &show_ndb_vars,                 SHOW_FUNC},
-  {"Ndb",          (char*) &ndb_status_variables_fixed,    SHOW_ARRAY},
   {"Ndb_conflict", (char*) &ndb_status_conflict_variables, SHOW_ARRAY},
   {"Ndb",          (char*) &ndb_status_injector_variables, SHOW_ARRAY},
   {"Ndb",          (char*) &ndb_status_slave_variables,    SHOW_ARRAY},


Attachment: [text/bzr-bundle] bzr/[e-mail]