bzr push into mysql-5.5-cluster-7.2 branch (john.duncan:3877 to 3878)

[John David Duncan]

 3878 John David Duncan	2012-04-05
      Fix for warnings in CluB.

    modified:
      storage/ndb/memcache/src/ndb_error_logger.cc
      storage/ndb/memcache/src/schedulers/S_sched.cc
 3877 John David Duncan	2012-04-05
      On-demand growth of the NdbInstance pool is enabled by default, and can be explicitly disabled or enabled by setting scheduler option g0 or g1.

    modified:
      storage/ndb/memcache/src/schedulers/S_sched.cc
      storage/ndb/memcache/src/schedulers/S_sched.h
=== modified file 'storage/ndb/memcache/src/ndb_error_logger.cc'
--- a/storage/ndb/memcache/src/ndb_error_logger.cc	2012-04-05 05:29:06 +0000
+++ b/storage/ndb/memcache/src/ndb_error_logger.cc	2012-04-06 01:00:19 +0000
@@ -208,8 +208,10 @@ void ndb_error_logger_stats(ADD_STAT add
 
   for(i = 0 ; i < ERROR_HASH_TABLE_SIZE; i++) {
     for(sym = error_hash_table[i] ; sym != 0 ; sym = sym->next) { 
-      klen = sprintf(key, "NDB_Error_%d", sym->error_code);
-      vlen = sprintf(val, "%lu", sym->count);
+      klen = sprintf(key, "%s_Error_%d", 
+                     (sym->error_code < 29000 ? "NDB" : "Engine"),
+                     sym->error_code);
+      vlen = sprintf(val, "%lu", (long unsigned int) sym->count);
       add_stat(key, klen, val, vlen, cookie);
     }
   }

=== modified file 'storage/ndb/memcache/src/schedulers/S_sched.cc'
--- a/storage/ndb/memcache/src/schedulers/S_sched.cc	2012-04-06 00:12:54 +0000
+++ b/storage/ndb/memcache/src/schedulers/S_sched.cc	2012-04-06 01:00:19 +0000
@@ -692,7 +692,7 @@ S::Connection::Connection(S::Cluster & _
   instances.max = instances.initial;
   // allow the pool to grow on demand? 
   if(global->options.auto_grow)
-    instances.max *= 1.6;
+    instances.max = (int) (instances.max * 1.6);
   // max_clients imposes a hard upper limit
   if(instances.max > (global->options.max_clients / cluster.nconnections))
     instances.max = global->options.max_clients / cluster.nconnections;

No bundle (reason: useless for push emails).