bk commit into 5.1 tree (jonas:1.2523)

[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@stripped, 2007-04-10 10:23:16+02:00, jonas@stripped +5 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/telco-6.1
  into  perch.ndb.mysql.com:/home/jonas/src/51-telco
  MERGE: 1.2403.15.78

  storage/ndb/include/kernel/signaldata/SumaImpl.hpp@stripped, 2007-04-10 10:23:13+02:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.10.1.1

  storage/ndb/src/kernel/blocks/suma/Suma.cpp@stripped, 2007-04-10 10:23:13+02:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.54.1.5

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp@stripped, 2007-04-10 10:23:13+02:00,
jonas@stripped +0 -4
    Auto merged
    MERGE: 1.157.2.3

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@stripped, 2007-04-10 10:23:13+02:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.77.2.3

  storage/ndb/src/ndbapi/ndberror.c@stripped, 2007-04-10 10:23:13+02:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.82.1.4

# 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/51-telco/RESYNC

--- 1.11/storage/ndb/include/kernel/signaldata/SumaImpl.hpp	2007-04-10 10:23:22 +02:00
+++ 1.12/storage/ndb/include/kernel/signaldata/SumaImpl.hpp	2007-04-10 10:23:22 +02:00
@@ -119,7 +119,8 @@
     Undefined = 1,
     NF_FakeErrorREF = 11,
     Busy = 701,
-    NotMaster = 702
+    NotMaster = 702,
+    PartiallyConnected = 1421
   };
 
   STATIC_CONST( SignalLength = 7 );

--- 1.65/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2007-04-10 10:23:22 +02:00
+++ 1.66/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2007-04-10 10:23:22 +02:00
@@ -2396,6 +2396,16 @@
     sendSubStartRef(signal, 1412);
     DBUG_VOID_RETURN;
   }
+
+  if (c_startup.m_restart_server_node_id == 0 && 
+      !c_connected_nodes.get(refToNode(subscriberRef)))
+    
+  {
+    jam();
+    sendSubStartRef(signal, SubStartRef::PartiallyConnected);
+    return;
+  }
+  
   DBUG_PRINT("info",("c_subscriberPool  size: %d free: %d",
 		     c_subscriberPool.getSize(),
 		     c_subscriberPool.getNoOfFree()));

--- 1.87/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2007-04-10 10:23:22 +02:00
+++ 1.88/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2007-04-10 10:23:22 +02:00
@@ -983,7 +983,7 @@
 NdbEventBuffer::NdbEventBuffer(Ndb *ndb) :
   m_system_nodes(ndb->theImpl->theNoOfDBnodes),
   m_ndb(ndb),
-  m_latestGCI(0),
+  m_latestGCI(0), m_latest_complete_GCI(0),
   m_total_alloc(0),
   m_free_thresh(10),
   m_min_free_thresh(10),
@@ -1475,7 +1475,7 @@
                                       , m_flush_gci
 #endif
                                       );
-
+  Uint32 idx = bucket - (Gci_container*)m_active_gci.getBase();
   if (unlikely(bucket == 0))
   {
     /**
@@ -1520,8 +1520,20 @@
       }
       reportStatus();
       bzero(bucket, sizeof(Gci_container));
-      bucket->m_gci = gci + ACTIVE_GCI_DIRECTORY_SIZE;
-      bucket->m_gcp_complete_rep_count = m_system_nodes;
+      if (likely(idx < ACTIVE_GCI_DIRECTORY_SIZE))
+      {
+        /**
+         * Only "prepare" next GCI if we're in
+         *   the first 4 highest GCI's...else
+         *   this is somekind of "late" GCI...
+         *   which is only initialized to 0
+         *
+         *   This to make sure we dont get several buckets with same GCI
+         */
+        bucket->m_gci = gci + ACTIVE_GCI_DIRECTORY_SIZE;
+        bucket->m_gcp_complete_rep_count = m_system_nodes;
+      }
+      
       if(unlikely(m_latest_complete_GCI > gci))
       {
 	complete_outof_order_gcis();

--- 1.93/storage/ndb/src/ndbapi/ndberror.c	2007-04-10 10:23:22 +02:00
+++ 1.94/storage/ndb/src/ndbapi/ndberror.c	2007-04-10 10:23:22 +02:00
@@ -491,6 +491,7 @@
   { 1419, DMEC, SE, "Subscription already dropped" },
 
   { 1420, DMEC, TR, "Subscriber manager busy with adding/removing a table" },
+  { 1421, DMEC, SE, "Partially connected API in NdbOperation::execute()" },
 
   { 4004, DMEC, AE, "Attribute name or id not found in the table" },