bk commit into 5.1 tree (jonas:1.2370) BUG#19645

[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-01-19 17:01:52+01:00, jonas@stripped +2 -0
  ndb - bug#19645
    fix some more sp100 hang cases

  storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp@stripped, 2007-01-19 17:01:49+01:00, jonas@stripped +5 -0
    let suma know of API_FAILREQ even if not connected, to handle startme/handover 
      problem

  storage/ndb/src/kernel/blocks/suma/Suma.cpp@stripped, 2007-01-19 17:01:49+01:00, jonas@stripped +29 -0
    some error inserts
    + resend API_FAILREQ during handover

# 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-work

--- 1.45/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2007-01-19 17:01:57 +01:00
+++ 1.46/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2007-01-19 17:01:57 +01:00
@@ -2456,7 +2456,12 @@
 
   // ignore if api not active
   if (failedNodePtr.p->phase != ZAPI_ACTIVE)
+  {
+    jam();
+    // But send to SUMA anyway...
+    sendSignal(SUMA_REF, GSN_API_FAILREQ, signal, 2, JBA);
     return;
+  }
 
   signal->theData[0] = NDB_LE_Disconnected;
   signal->theData[1] = failedNodePtr.i;

--- 1.50/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2007-01-19 17:01:57 +01:00
+++ 1.51/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2007-01-19 17:01:57 +01:00
@@ -319,6 +319,12 @@
       createSequence(signal);
       DBUG_VOID_RETURN;
     }//if
+    
+    if (ERROR_INSERTED(13030))
+    {
+      ndbout_c("Dont start handover");
+      return;
+    }
   }//if
   
   if(startphase == 100)
@@ -564,6 +570,15 @@
   Uint32 failedApiNode = signal->theData[0];
   //BlockReference retRef = signal->theData[1];
 
+  if (c_startup.m_restart_server_node_id &&
+      c_startup.m_restart_server_node_id != RNIL)
+  {
+    jam();
+    sendSignalWithDelay(reference(), GSN_API_FAILREQ, signal,
+                        200, signal->getLength());
+    return;
+  }
+
   c_failedApiNodes.set(failedApiNode);
   c_connected_nodes.clear(failedApiNode);
   bool found = removeSubscribersOnNode(signal, failedApiNode);
@@ -911,6 +926,20 @@
   if (tCase == 8008)
   {
     CLEAR_ERROR_INSERT_VALUE;
+  }
+
+  if (tCase == 8009)
+  {
+    if (ERROR_INSERTED(13030))
+    {
+      CLEAR_ERROR_INSERT_VALUE;
+      sendSTTORRY(signal);
+    }
+    else
+    {
+      SET_ERROR_INSERT_VALUE(13030);
+    }
+    return;
   }
 }