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

[Pekka Nousiainen]

 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
 4423 Pekka Nousiainen	2011-08-11
      wl#4124 f01_event.diff
      listen to data events on head table

    modified:
      sql/ha_ndb_index_stat.cc
      sql/ha_ndb_index_stat.h
      storage/ndb/include/ndb_constants.h
      storage/ndb/include/ndbapi/NdbIndexStat.hpp
      storage/ndb/src/ndbapi/NdbIndexStat.cpp
      storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp
      storage/ndb/src/ndbapi/NdbIndexStatImpl.hpp
      storage/ndb/test/ndbapi/testIndexStat.cpp
      storage/ndb/tools/ndb_index_stat.cpp
=== modified file 'sql/ha_ndb_index_stat.cc'
--- a/sql/ha_ndb_index_stat.cc	2011-08-11 17:11:30 +0000
+++ b/sql/ha_ndb_index_stat.cc	2011-08-12 05:16:41 +0000
@@ -1740,6 +1740,9 @@ ndb_index_stat_thread_func(void *arg __a
   NdbIndexStat is_util;
   pr.is_util= &is_util;
 
+  bool have_listener;
+  have_listener= false;
+
   // wl4124_todo remove useless stuff copied from utility thread
  
   pthread_mutex_lock(&LOCK_ndb_index_stat_thread);
@@ -1831,8 +1834,6 @@ ndb_index_stat_thread_func(void *arg __a
   ndb_index_stat_allow(1);
   bool enable_ok;
   enable_ok= false;
-  bool have_listener;
-  have_listener= false;
 
   set_timespec(abstime, 0);
   for (;;)

=== modified file 'storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp'
--- a/storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp	2011-08-11 17:11:30 +0000
+++ b/storage/ndb/src/ndbapi/NdbIndexStatImpl.cpp	2011-08-12 05:16:41 +0000
@@ -2339,6 +2339,7 @@ NdbIndexStatImpl::check_sysevents(Ndb* n
     setError(dic->getNdbError().code, __LINE__);
     return -1;
   }
+  delete ev; // getEvent() creates new instance
   return 0;
 }
 

No bundle (reason: useless for push emails).