From 5a90386708230d3ea58ebcf620e70cb648e88c4f Mon Sep 17 00:00:00 2001
From: unknown <tomas@poseidon.ndb.mysql.com>
Date: Thu, 6 Jul 2006 01:33:53 +0200
Subject: [PATCH] Bug #20843 tests fails randomly with assertion in
 completeClusterFailed - flush gci needs to be reset on disconnect as cluster
 may reconnect after --initial with a smaller gci

storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Bug #20843 tests fails randomly with assertion in completeClusterFailed
  reenabled test
---
 mysql-test/t/disabled.def                        | 1 -
 storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 5acf93d4843..ebe61e1af4a 100644
--- 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
diff --git a/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp b/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
index 5cf974b6467..06b0d7ea5b9 100644
--- 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
    */