bk commit into 5.1 tree (tomas:1.1970)

[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.1970 06/01/18 12:04:38 tomas@stripped[tomas] +2 -0
  bug14199.patch

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.96 06/01/18 12:00:49 tomas@stripped[tomas] +29 -1
    Import patch bug14199.patch

  storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
    1.5 06/01/18 12:00:49 tomas@stripped[tomas] +2 -0
    Import patch bug14199.patch

# 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/wl2325-alcatel

--- 1.4/storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp	2005-04-08 02:43:50 +02:00
+++ 1.5/storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp	2006-01-18 12:00:49 +01:00
@@ -98,6 +98,8 @@
     StartTcTimer = 2509,
     StopTcTimer = 2510,
     StartPeriodicTcTimer = 2511,
+    TcStartDumpIndexOpCount = 2512,
+    TcDumpIndexOpCount = 2513,
     CmvmiDumpConnections = 2600,
     CmvmiDumpLongSignalMemory = 2601,
     CmvmiSetRestartOnErrorInsert = 2602,

--- 1.95/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2006-01-18 11:05:56 +01:00
+++ 1.96/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2006-01-18 12:00:49 +01:00
@@ -4676,6 +4676,7 @@
   regTmpApiPtr->commitAckMarker = RNIL;
   regTmpApiPtr->firstTcConnect = RNIL;
   regTmpApiPtr->lastTcConnect = RNIL;
+  releaseAllSeizedIndexOperations(regTmpApiPtr);
 }//Dbtc::copyApi()
 
 void Dbtc::unlinkApiConnect(Signal* signal) 
@@ -10270,7 +10271,7 @@
   // apiConnectptr.p->apiConnectstate = CS_CONNECTED;
   apiConnectptr.p->apiConnectstate = CS_ABORTING;
   apiConnectptr.p->abortState = AS_IDLE;
-
+  releaseAllSeizedIndexOperations(apiConnectptr.p);
   if(apiConnectptr.p->m_exec_flag || apiConnectptr.p->apiFailState == ZTRUE){
     jam();
     bool ok = false;
@@ -10842,6 +10843,33 @@
     c_counters.reset();
     signal->theData[0] = TcContinueB::ZTRANS_EVENT_REP;
     sendSignalWithDelay(cownref, GSN_CONTINUEB, signal, 5000, 1);
+  }
+
+  if (dumpState->args[0] == DumpStateOrd::TcStartDumpIndexOpCount)
+  {
+    static int frequency = 1;
+    if (signal->getLength() > 1)
+      frequency = signal->theData[1];
+    else
+      if (refToBlock(signal->getSendersBlockRef()) != DBTC)
+	frequency = 1;
+    
+    if (frequency)
+    {
+      dumpState->args[0] = DumpStateOrd::TcDumpIndexOpCount;
+      execDUMP_STATE_ORD(signal);
+      dumpState->args[0] = DumpStateOrd::TcStartDumpIndexOpCount;
+      
+      Uint32 delay = 1000 * (frequency > 25 ? 25 : frequency);
+      sendSignalWithDelay(cownref, GSN_DUMP_STATE_ORD, signal, delay, 1);
+    }
+  }
+  
+  if (dumpState->args[0] == DumpStateOrd::TcDumpIndexOpCount)
+  {
+    infoEvent("IndexOpCount: pool: %d free: %d", 
+	      c_theIndexOperationPool.getSize(),
+	      c_theIndexOperationPool.getNoOfFree());
   }
 }//Dbtc::execDUMP_STATE_ORD()