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

[John David Duncan]

 3857 John David Duncan	2012-03-22 [merge]
      merge

    modified:
      storage/ndb/memcache/src/schedulers/S_sched.cc
 3856 John David Duncan	2012-03-21 [merge]
      merge

    modified:
      storage/ndb/memcache/include/Queue.h
=== modified file 'storage/ndb/memcache/src/schedulers/S_sched.cc'
--- a/storage/ndb/memcache/src/schedulers/S_sched.cc	2012-03-07 01:22:53 +0000
+++ b/storage/ndb/memcache/src/schedulers/S_sched.cc	2012-03-22 19:24:32 +0000
@@ -538,7 +538,7 @@ S::WorkerConnection::WorkerConnection(Sc
 
   /* Build the freelist */
   freelist = 0;
-  int my_ndb_inst = conn->nInst / global->options.n_worker_threads;
+  int my_ndb_inst = conn->nInst / conn->n_workers;
   for(int j = 0 ; j < my_ndb_inst ; j++ ) {
     NdbInstance *inst = new NdbInstance(conn->conn, 2);
     inst->id = ((id.thd + 1) * 10000) + j + 1; 

No bundle (reason: useless for push emails).