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

[John David Duncan]

 3823 John David Duncan	2012-02-21 [merge]
      Merge from 7.2.4-bugs

    modified:
      storage/ndb/memcache/src/QueryPlan.cc
      storage/ndb/memcache/src/ndb_engine.c
 3822 jonas oreland	2012-02-21 [merge]
      ndb - merge 71 to 72

    modified:
      storage/ndb/test/run-test/conf-upgrade.cnf
=== modified file 'storage/ndb/memcache/src/QueryPlan.cc'
--- a/storage/ndb/memcache/src/QueryPlan.cc	2011-12-16 10:04:43 +0000
+++ b/storage/ndb/memcache/src/QueryPlan.cc	2012-02-22 00:19:45 +0000
@@ -78,7 +78,11 @@ QueryPlan::QueryPlan(Ndb *my_ndb, const 
   dup_numbers(false),
   is_scan(false),
   spec(my_spec),
+  extern_store(0),
   static_flags(spec->static_flags),
+  key_record(0), 
+  val_record(0),
+  row_record(0),
   db(my_ndb)
 {
   const NdbDictionary::Column *col;

=== modified file 'storage/ndb/memcache/src/ndb_engine.c'
--- a/storage/ndb/memcache/src/ndb_engine.c	2011-12-18 23:21:21 +0000
+++ b/storage/ndb/memcache/src/ndb_engine.c	2012-02-22 00:19:45 +0000
@@ -264,9 +264,8 @@ static void ndb_destroy(ENGINE_HANDLE* h
 
   struct ndb_engine* ndb_eng = ndb_handle(handle);
   struct default_engine *def_eng = default_handle(ndb_eng);
-  int nthreads = ndb_eng->server_options.nthreads;
 
-  for(int i = 0 ; i < nthreads; i ++) {
+  for(int i = 0 ; i < ndb_eng->npipelines; i ++) {
     void *p = ndb_eng->schedulers[i];
     if(p) {
       shutdown_scheduler(p);

No bundle (reason: useless for push emails).