bk commit into 5.1 tree (tomas:1.1945)

[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.1945 05/10/26 22:50:57 tomas@stripped +1 -0
  still growing Gci_container in ndb event

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
    1.23 05/10/26 22:50:46 tomas@stripped +5 -5
    still growing Gci_container in ndb event

# 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-wl2325-5.0

--- 1.22/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2005-09-15 12:30:51 +02:00
+++ 1.23/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2005-10-26 22:50:46 +02:00
@@ -855,6 +855,11 @@
 void
 NdbEventBuffer::execSUB_GCP_COMPLETE_REP(const SubGcpCompleteRep * const rep)
 {
+  if (unlikely(m_active_op_count == 0))
+  {
+    return;
+  }
+  
   DBUG_ENTER("NdbEventBuffer::execSUB_GCP_COMPLETE_REP");
 
   const Uint64 gci= rep->gci;
@@ -862,11 +867,6 @@
 
   Gci_container *bucket = find_bucket(&m_active_gci, gci);
 
-  if (unlikely(m_active_op_count == 0))
-  {
-    DBUG_VOID_RETURN;
-  }
-  
   if (unlikely(bucket == 0))
   {
     /**