bzr push into mysql-5.1-telco-7.1 branch (jonas.oreland:4332 to 4333)

[jonas oreland]

 4333 jonas oreland	2011-11-10 [merge]
      ndb - merge 70 to 71

    modified:
      sql/ha_ndbcluster.cc
      storage/ndb/src/common/portlib/NdbThread.c
 4332 Martin Skold	2011-11-10 [merge]
      Merge

    modified:
      mysql-test/suite/ndb/r/ndb_condition_pushdown.result
      mysql-test/suite/ndb/t/ndb_condition_pushdown.test
      sql/ha_ndbcluster_cond.cc
      sql/ha_ndbcluster_cond.h
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-11-10 14:23:53 +0000
+++ b/sql/ha_ndbcluster.cc	2011-11-10 19:40:14 +0000
@@ -12513,6 +12513,7 @@ static int ndbcluster_end(handlerton *ht
   ndbcluster_disconnect();
 
   ndb_util_thread.deinit();
+  ndb_index_stat_thread.deinit();
 
   // cleanup ndb interface
   ndb_end_internal();

=== modified file 'storage/ndb/src/common/portlib/NdbThread.c'
--- a/storage/ndb/src/common/portlib/NdbThread.c	2011-10-21 08:59:23 +0000
+++ b/storage/ndb/src/common/portlib/NdbThread.c	2011-11-10 15:06:03 +0000
@@ -540,11 +540,17 @@ NdbThread_End()
   {
     NdbMutex_Destroy(g_ndb_thread_mutex);
   }
-  
+
   if (g_ndb_thread_condition)
   {
     NdbCondition_Destroy(g_ndb_thread_condition);
   }
+
+  if (g_main_thread)
+  {
+    NdbMem_Free((char *)g_main_thread);
+    g_main_thread = 0;
+  }
 }
 
 int

No bundle (reason: useless for push emails).