Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
4d0d6cff · tomas@poseidon.ndb.mysql.com · 0c5c9e17 · e2db01e3 · 4d0d6cff · 4d0d6cff
Commit 4d0d6cff authored Jul 06, 2006 by tomas@poseidon.ndb.mysql.com
6 changed files
--- a/mysql-test/r/ndb_dd_advance.result
+++ b/mysql-test/r/ndb_dd_advance.result
--- a/mysql-test/r/ndb_dd_advance2.result
+++ b/mysql-test/r/ndb_dd_advance2.result
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -18,7 +18,6 @@
 #im_life_cycle             : Bug#20368 2006-06-10 alik    im_life_cycle test fails
 ndb_autodiscover         : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
 ndb_autodiscover2        : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
-ndb_autodiscover3        : BUG#20872 2006-07-05 tomas ndb_autodiscover3 fails randomly
 ndb_load                 : BUG#17233 2006-05-04 tomas failed load data from infile causes mysqld dbug_assert, binlog not flushed
 partition_03ndb          : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table
 ps_7ndb                  : BUG#18950 2006-02-16 jmiller create table like does not obtain LOCK_open

--- a/mysql-test/t/ndb_dd_advance.test
+++ b/mysql-test/t/ndb_dd_advance.test
--- a/mysql-test/t/ndb_dd_advance2.test
+++ b/mysql-test/t/ndb_dd_advance2.test
--- a/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
+++ b/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
@@ -1658,6 +1658,10 @@ NdbEventBuffer::completeClusterFailed()
  data.logType = SubTableData::LOG;
  data.gci = m_latestGCI + 1;
  
+#ifdef VM_TRACE
+  m_flush_gci = 0;
+#endif
+
  /**
   * Insert this event for each operation
   */