MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Jonas Oreland Date:March 23 2010 8:42am
Subject:bzr push into mysql-5.1-telco-7.0 branch (jonas:3470 to 3471)
View as plain text  
 3471 Jonas Oreland	2010-03-23
      ndb - fix NdbInfo::flush_tables, which incorrect assumes that entries in tables are in order of insert, which is not the case as it's a hash-table - this cause spurious test-failures in ndb.ndbinfo

    modified:
      storage/ndb/src/ndbapi/NdbInfo.cpp
 3470 Jonas Oreland	2010-03-23 [merge]
      merge 63 to 70

    modified:
      sql/ha_ndbcluster_binlog.cc
=== modified file 'storage/ndb/src/ndbapi/NdbInfo.cpp'
--- a/storage/ndb/src/ndbapi/NdbInfo.cpp	2010-01-25 10:04:59 +0000
+++ b/storage/ndb/src/ndbapi/NdbInfo.cpp	2010-03-23 08:38:52 +0000
@@ -313,7 +313,15 @@ void NdbInfo::flush_tables()
   // Delete all but the hardcoded tables
   while (m_tables.entries() > NUM_HARDCODED_TABLES)
   {
-    m_tables.remove(NUM_HARDCODED_TABLES);
+    for (size_t i = 0; i<m_tables.entries(); i++)
+    {
+      Table * tab = m_tables.value(i);
+      if (! (tab == m_tables_table || tab == m_columns_table))
+      {
+        m_tables.remove(i);
+        break;
+      }
+    }
   }
   assert(m_tables.entries() == NUM_HARDCODED_TABLES);
 }


Attachment: [text/bzr-bundle] bzr/jonas@mysql.com-20100323083852-pbnr2rb7u42rtfl9.bundle
Thread
bzr push into mysql-5.1-telco-7.0 branch (jonas:3470 to 3471)Jonas Oreland23 Mar