bk commit into 5.1 tree (pekka:1.2581)

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart 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-08-01 21:06:41+10:00, pekka@stripped +2 -0
  [PATCH] replace ERROR_INSERT by DUMP to force reports of GCP time
  
  Index: my51-t61-a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
  ===================================================================

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2007-08-01 10:00:00+10:00, pekka@stripped +8 -2
    replace ERROR_INSERT by DUMP to force reports of GCP time

  storage/ndb/src/kernel/vm/GlobalData.hpp@stripped, 2007-08-01 10:00:00+10:00, pekka@stripped +6 -0
    replace ERROR_INSERT by DUMP to force reports of GCP time

# 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:	pekka
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.1/telco-6.1.17

--- 1.118/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-08-01 12:07:06 +10:00
+++ 1.119/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-08-01 10:00:00 +10:00
@@ -8572,8 +8572,9 @@
 
       // random formula to report excessive duration
       bool report =
-        ERROR_INSERTED_CLEAR(7901) ||
-        ms_total > 3000 * (1 + cgcpDelay / 1000);
+        g.gcp_timer_limit != 0 ?
+          (ms_total > g.gcp_timer_limit) :
+          (ms_total > 3000 * (1 + cgcpDelay / 1000));
       if (report)
         infoEvent("GCP %u ms: total:%u commit:%u save:%u copygci:%u",
             coldgcp, ms_total, ms_commit, ms_save, ms_copygci);
@@ -14531,6 +14532,11 @@
     jam();
     crashSystemAtGcpStop(signal, true);
   }
+
+#ifdef GCP_TIMER_HACK
+  if (signal->theData[0] == 7901)
+    globalData.gcp_timer_limit = signal->theData[1];
+#endif
 }//Dbdih::execDUMP_STATE_ORD()
 
 void

--- 1.11/storage/ndb/src/kernel/vm/GlobalData.hpp	2007-08-01 12:07:06 +10:00
+++ 1.12/storage/ndb/src/kernel/vm/GlobalData.hpp	2007-08-01 10:00:00 +10:00
@@ -72,6 +72,9 @@
     theSignalId = 0; 
     theStartLevel = NodeState::SL_NOTHING;
     theRestartFlag = perform_start;
+#ifdef GCP_TIMER_HACK
+    gcp_timer_limit = 0;
+#endif
   }
   ~GlobalData(){}
   
@@ -97,6 +100,9 @@
   MicroSecondTimer gcp_timer_save[2];
   // sysfile update (DIH)
   MicroSecondTimer gcp_timer_copygci[2];
+
+  // report threshold in ms, if 0 guessed, set with dump 7901 <limit>
+  Uint32 gcp_timer_limit;
 #endif
 };