bzr push into mysql-5.1-telco-7.0-wl4124-new2 branch (pekka.nousiainen:4424 to 4425) WL#4124

[Pekka Nousiainen]

 4425 Pekka Nousiainen	2011-08-16
      wl#4124 x20_fix.diff
      no dtor is called due to useless pthread_exit(0)

    modified:
      sql/ha_ndb_index_stat.cc
 4424 Pekka Nousiainen	2011-08-12
      wl#4124 x19_fix.diff
      un-init var, mem leak

    modified:
      sql/ha_ndb_index_stat.cc
      storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp
=== modified file 'sql/ha_ndb_index_stat.cc'
--- a/sql/ha_ndb_index_stat.cc	2011-08-12 05:16:41 +0000
+++ b/sql/ha_ndb_index_stat.cc	2011-08-16 11:53:13 +0000
@@ -1737,8 +1737,6 @@ ndb_index_stat_thread_func(void *arg __a
   DBUG_ENTER("ndb_index_stat_thread_func");
 
   Ndb_index_stat_proc pr;
-  NdbIndexStat is_util;
-  pr.is_util= &is_util;
 
   bool have_listener;
   have_listener= false;
@@ -1813,6 +1811,14 @@ ndb_index_stat_thread_func(void *arg __a
   }
   pthread_mutex_unlock(&LOCK_ndb_index_stat_thread);
 
+  /* Get instance used for sys objects check and create */
+  if (!(pr.is_util= new NdbIndexStat))
+  {
+    sql_print_error("Could not allocate NdbIndexStat is_util object");
+    pthread_mutex_lock(&LOCK_ndb_index_stat_thread);
+    goto ndb_index_stat_thread_end;
+  }
+
   /* Get thd_ndb for this thread */
   if (!(thd_ndb= ha_ndbcluster::seize_thd_ndb()))
   {
@@ -1916,6 +1922,11 @@ ndb_index_stat_thread_fail:
     if (ndb_index_stat_stop_listener(pr) == 0)
       have_listener= false;
   }
+  if (pr.is_util)
+  {
+    delete pr.is_util;
+    pr.is_util= 0;
+  }
   if (thd_ndb)
   {
     ha_ndbcluster::release_thd_ndb(thd_ndb);

No bundle (reason: useless for push emails).