bzr push into mysql-5.1 branch (tomas.ulin:3189 to 3190)

[Tomas Ulin]

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

 3189 Jonas Oreland	2008-12-19
      ndb - 6.4 only - SR not possible after alter table (incorrect table id in table file)
modified:
  mysql-test/suite/ndb_binlog/r/ndb_binlog_discover.result
  mysql-test/suite/ndb_binlog/t/ndb_binlog_discover.test
  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp

=== modified file 'storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp'
--- a/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2008-12-19 11:18:16 +0000
+++ b/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2008-12-19 13:24:24 +0000
@@ -2327,7 +2327,7 @@ NdbEventBuffer::report_node_failure_comp
 
   DBUG_PRINT("info", ("Cluster failure"));
 
-  Uint64 gci = Uint64((m_latestGCI >> 32) + 1) << 32;
+  gci = Uint64((m_latestGCI >> 32) + 1) << 32;
   bool found = find_max_known_gci(&gci);
 
   Uint64 * array = m_known_gci.getBase();