From: Date: December 19 2008 12:18pm
Subject: bzr push into mysql-5.1 branch (tomas.ulin:3187 to 3188)
List-Archive: http://lists.mysql.com/commits/62080
Message-Id: <20081219111853.2B4565D8396@linux.local>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3188 Tomas Ulin	2008-12-19 [merge]
      merge
modified:
  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp

 3187 Jonas Oreland	2008-12-19
      ndb - bug#41353 - handle any order pk
modified:
  mysql-test/suite/ndb/r/ndb_add_partition.result
  mysql-test/suite/ndb/t/ndb_add_partition.test
  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
  storage/ndb/src/kernel/blocks/trix/Trix.cpp

=== modified file 'storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp'
--- a/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2008-12-16 21:21:55 +0000
+++ b/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2008-12-19 11:18:16 +0000
@@ -2307,7 +2307,7 @@ NdbEventBuffer::report_node_failure_comp
   data.flags = SubTableData::LOG;
 
   Uint64 gci = Uint64((m_latestGCI >> 32) + 1) << 32;
-  bool found = find_max_known_gci(&gci);
+  find_max_known_gci(&gci);
 
   data.gci_hi = Uint32(gci >> 32);
   data.gci_lo = Uint32(gci);
@@ -2326,6 +2326,9 @@ NdbEventBuffer::report_node_failure_comp
    */
 
   DBUG_PRINT("info", ("Cluster failure"));
+
+  Uint64 gci = Uint64((m_latestGCI >> 32) + 1) << 32;
+  bool found = find_max_known_gci(&gci);
 
   Uint64 * array = m_known_gci.getBase();
   Uint32 mask = m_known_gci.size() - 1;