bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4686 to 4687)

[jonas oreland]

 4687 jonas oreland	2011-11-22
      ndb - fix bug found by compiler warning

    modified:
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
 4686 jonas oreland	2011-11-22
      ndb index stat
        This patch adds a "is_setup_complete" method to Ndb_index_stat_thread
        The makes ndb-wait-setup also wait for ndb_index_stat_allow() == true
          if index-stat is enabled.
      
        This is good for several reasons, but not complete!
          We should later also check that not only "ndb_index_stat_allow() == true"
          but that the actual tables has been created, and that the listener is setup.
          However, all of this can be coded inside Ndb_index_stat_thread::is_setup_complete

    modified:
      sql/ha_ndb_index_stat.cc
      sql/ha_ndb_index_stat.h
      sql/ha_ndbcluster.cc
=== modified file 'storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2011-11-19 14:55:47 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2011-11-22 10:06:04 +0000
@@ -8101,7 +8101,7 @@ Dbdict::alterTable_parse(Signal* signal,
      * Mark SchemaObject as in-use so that it's won't be found by other op
      *   choose a state that will be automatically cleaned incase we crash
      */
-    SchemaFile::TableEntry * objEntry =
+    SchemaFile::TableEntry *
       objEntry = getTableEntry(alterTabPtr.p->m_newTable_realObjectId);
     objEntry->m_tableType = DictTabInfo::SchemaTransaction;
     objEntry->m_tableState = SchemaFile::SF_STARTED;
@@ -9568,7 +9568,7 @@ Dbdict::alterTable_fromCommitComplete(Si
 
   {
     // Remark object as free
-    SchemaFile::TableEntry * objEntry =
+    SchemaFile::TableEntry *
       objEntry = getTableEntry(alterTabPtr.p->m_newTable_realObjectId);
     objEntry->m_tableType = DictTabInfo::UndefTableType;
     objEntry->m_tableState = SchemaFile::SF_UNUSED;
@@ -9660,7 +9660,7 @@ Dbdict::alterTable_abortParse(Signal* si
 
     {
       // Remark object as free
-      SchemaFile::TableEntry * objEntry =
+      SchemaFile::TableEntry *
         objEntry = getTableEntry(alterTabPtr.p->m_newTable_realObjectId);
       objEntry->m_tableType = DictTabInfo::UndefTableType;
       objEntry->m_tableState = SchemaFile::SF_UNUSED;

No bundle (reason: useless for push emails).