bk commit into 5.1 tree (tomas:1.2248) BUG#20843

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2248 06/07/06 01:33:53 tomas@stripped +2 -0
  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
    1.66 06/07/06 01:33:38 tomas@stripped +4 -0
    Bug #20843 tests fails randomly with assertion in completeClusterFailed
    reenabled test

  mysql-test/t/disabled.def
    1.174 06/07/06 01:33:37 tomas@stripped +0 -1
    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

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-ndb

--- 1.173/mysql-test/t/disabled.def	2006-07-05 23:12:40 +02:00
+++ 1.174/mysql-test/t/disabled.def	2006-07-06 01:33:37 +02:00
@@ -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

--- 1.65/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2006-07-05 14:20:01 +02:00
+++ 1.66/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2006-07-06 01:33:38 +02:00
@@ -1658,6 +1658,10 @@
   data.logType = SubTableData::LOG;
   data.gci = m_latestGCI + 1;
   
+#ifdef VM_TRACE
+  m_flush_gci = 0;
+#endif
+
   /**
    * Insert this event for each operation
    */