bzr commit into mysql-5.1-telco-7.0 branch (jonas:4281)

[jonas oreland]

#At file:///home/jonas/src/telco-7.0/ based on revid:ole.john.aske@stripped

 4281 jonas oreland	2011-04-05
      ndb - add new error-insert(5714) to trace nr-copy

    modified:
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp	2011-03-28 11:59:09 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp	2011-04-05 09:38:31 +0000
@@ -3342,7 +3342,16 @@ Dblqh::accminupdate(Signal* signal, Uint
   signal->theData[0] = regTcPtr.p->accConnectrec;
   signal->theData[1] = key->m_page_no << MAX_TUPLES_BITS | key->m_page_idx;
   c_acc->execACCMINUPDATE(signal);
-  
+
+  if (ERROR_INSERTED(5714))
+  {
+    FragrecordPtr regFragptr;
+    regFragptr.i = regTcPtr.p->fragmentptr;
+    c_fragment_pool.getPtr(regFragptr);
+    if (regFragptr.p->m_copy_started_state == Fragrecord::AC_NR_COPY)
+      ndbout << " LK: " << *key;
+  }
+
   if (ERROR_INSERTED(5712) || ERROR_INSERTED(5713))
     ndbout << " LK: " << *key;
   regTcPtr.p->m_row_id = *key;
@@ -3352,6 +3361,14 @@ inline
 bool
 Dblqh::TRACE_OP_CHECK(const TcConnectionrec* regTcPtr)
 {
+  if (ERROR_INSERTED(5714))
+  {
+    FragrecordPtr regFragptr;
+    regFragptr.i = regTcPtr->fragmentptr;
+    c_fragment_pool.getPtr(regFragptr);
+    return regFragptr.p->m_copy_started_state == Fragrecord::AC_NR_COPY;
+  }
+
   return (ERROR_INSERTED(5712) && 
 	  (regTcPtr->operation == ZINSERT ||
 	   regTcPtr->operation == ZDELETE)) ||

=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2011-03-29 06:47:20 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2011-04-05 09:38:31 +0000
@@ -5792,7 +5792,7 @@ void Dblqh::execTUP_DEALLOCREQ(Signal* s
     regTcPtr.p->m_row_id.m_page_no = signal->theData[2];
     regTcPtr.p->m_row_id.m_page_idx = signal->theData[3];
 
-    TRACE_OP(regTcPtr.p, "DEALLOC");
+    TRACE_OP(regTcPtr.p, "SET DEALLOC");
     
     ndbrequire(regTcPtr.p->m_dealloc == 0);
     regTcPtr.p->m_dealloc = 1;
@@ -7096,7 +7096,7 @@ void Dblqh::releaseOprec(Signal* signal)
     if (TRACENR_FLAG)
       TRACENR("DELETED: " << regTcPtr->m_row_id << endl);
 
-    TRACE_OP(regTcPtr, "DEALLOC");
+    TRACE_OP(regTcPtr, "DO DEALLOC");
     
     signal->theData[0] = regTcPtr->fragmentid;
     signal->theData[1] = regTcPtr->tableref;
@@ -12175,6 +12175,11 @@ void Dblqh::continueFirstCopyAfterBlocke
    * Start sending ROWID for all operations from now on
    */
   fragptr.p->m_copy_started_state = Fragrecord::AC_NR_COPY;
+  if (ERROR_INSERTED(5714))
+  {
+    ndbout_c("Starting copy of tab: %u frag: %u",
+             fragptr.p->tabRef, fragptr.p->fragId);
+  }
 
   scanptr.i = tcConnectptr.p->tcScanRec;
   c_scanRecordPool.getPtr(scanptr);
@@ -12700,7 +12705,12 @@ void Dblqh::closeCopyLab(Signal* signal)
    * Stop sending ROWID for all operations from now on
    */
   fragptr.p->m_copy_started_state = Fragrecord::AC_NORMAL;
-  
+  if (ERROR_INSERTED(5714))
+  {
+    ndbout_c("Copy of tab: %u frag: %u complete",
+             fragptr.p->tabRef, fragptr.p->fragId);
+  }
+
   scanptr.i = tcConnectptr.p->tcScanRec;
   c_scanRecordPool.getPtr(scanptr);
   scanptr.p->scanState = ScanRecord::WAIT_CLOSE_COPY;


Attachment: [text/bzr-bundle] bzr/[e-mail]