bk commit into 5.1 tree (jonas:1.2338) BUG#24717

[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, 2006-12-01 11:08:53+01:00, jonas@stripped +3 -0
  ndb - bug#24717
    fixes to testprogram to test new impl. in 5.1

  storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp@stripped, 2006-12-01 11:08:51+01:00, jonas@stripped +1 -1
    move tsman dumps

  storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@stripped, 2006-12-01 11:08:51+01:00, jonas@stripped +9 -5
    add more support for connection handling using dumps

  storage/ndb/test/ndbapi/testNodeRestart.cpp@stripped, 2006-12-01 11:08:51+01:00, jonas@stripped +3 -1
    port testprogram to 5.1 to avoid "extra" safety net in LQH

# 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.11/storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp	2006-12-01 11:08:58 +01:00
+++ 1.12/storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp	2006-12-01 11:08:58 +01:00
@@ -141,7 +141,7 @@
     TuxSetLogFlags = 12002,
     TuxMetaDataJunk = 12009,
     
-    DumpTsman = 9002, 
+    DumpTsman = 9800, 
     DumpLgman = 10000,
     DumpPgman = 11000
   };

--- 1.35/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp	2006-12-01 11:08:58 +01:00
+++ 1.36/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp	2006-12-01 11:08:58 +01:00
@@ -578,6 +578,7 @@
       /**
        * Dont allow api nodes to connect
        */
+      ndbout_c("%d %d %d", hostId, type, globalData.theStartLevel);
       abort();
       globalTransporterRegistry.do_disconnect(hostId);
     }
@@ -1208,13 +1209,16 @@
   if (arg == 9001)
   {
     CLEAR_ERROR_INSERT_VALUE;
-    for (Uint32 i = 0; i<MAX_NODES; i++)
+    if (signal->getLength() == 1 || signal->theData[1])
     {
-      if (c_error_9000_nodes_mask.get(i))
+      for (Uint32 i = 0; i<MAX_NODES; i++)
       {
-	signal->theData[0] = 0;
-	signal->theData[1] = i;
-	EXECUTE_DIRECT(CMVMI, GSN_OPEN_COMREQ, signal, 2);
+	if (c_error_9000_nodes_mask.get(i))
+	{
+	  signal->theData[0] = 0;
+	  signal->theData[1] = i;
+	  EXECUTE_DIRECT(CMVMI, GSN_OPEN_COMREQ, signal, 2);
+	}
       }
     }
     c_error_9000_nodes_mask.clear();

--- 1.34/storage/ndb/test/ndbapi/testNodeRestart.cpp	2006-12-01 11:08:58 +01:00
+++ 1.35/storage/ndb/test/ndbapi/testNodeRestart.cpp	2006-12-01 11:08:58 +01:00
@@ -1005,7 +1005,7 @@
   
   HugoTransactions hugoTrans(*ctx->getTab());
 
-  int dump[] = { 9002, 0 } ;
+  int dump[] = { 9000, 0 } ;
   Uint32 ownNode = refToNode(pNdb->getReference());
   dump[1] = ownNode;
 
@@ -1025,6 +1025,8 @@
       hugoTrans.pkReadRecords(pNdb, 100, 1, NdbOperation::LM_CommittedRead);
     }
     
+    int reset[2] = { 9001, 0 };
+    restarter.dumpStateOneNode(nodeId, reset, 2);
     restarter.waitClusterStarted();
   }