bk commit into 5.1 tree (jonas:1.1912) BUG#13610

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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.1912 05/10/06 11:20:19 jonas@stripped +1 -0
  bug#13610 - ndb
    incorrectly computed m_gcp_complete_rep for partial start
    gives assert in debug mode, and error in ndbapi in release

  storage/ndb/src/kernel/blocks/suma/Suma.cpp
    1.23 05/10/06 11:20:12 jonas@stripped +12 -1
    Compute no of gcp_complete_rep that Im contributioning correctly
      by computing distinct nodes of all the buckets im handling as if all were started

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.1

--- 1.22/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2005-09-15 10:42:04 +02:00
+++ 1.23/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2005-10-06 11:20:12 +02:00
@@ -198,7 +198,18 @@
     }
     
     if(!m_active_buckets.isclear())
-      m_gcp_complete_rep_count = 1; // I contribute 1 gcp complete rep
+    {
+      NdbNodeBitmask tmp;
+      Uint32 bucket = 0;
+      while (m_active_buckets.find(bucket) != Bucket_mask::NotFound)
+      {
+	tmp.set(get_responsible_node(bucket, c_nodes_in_nodegroup_mask));
+	bucket++;
+      }
+      
+      ndbassert(tmp.get(getOwnNodeId()));
+      m_gcp_complete_rep_count = tmp.count();// I contribute 1 gcp complete rep
+    }
     else
       m_gcp_complete_rep_count = 0; // I contribute 1 gcp complete rep