bzr push into mysql-5.1 branch (gni:2719 to 2720) WL#3928

[Guangbao Ni]

 2720 Guangbao Ni	2008-08-21
      WL#3928 periodic fragment log file initialization status reporting
modified:
  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

 2719 Guangbao Ni	2008-08-21
      WL#3928 periodic fragment log file initialization status reporting
modified:
  storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
  storage/ndb/include/mgmapi/mgmapi_config_parameters.h
  storage/ndb/include/mgmapi/ndb_logevent.h
  storage/ndb/src/common/debugger/EventLogger.cpp
  storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
  storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
  storage/ndb/src/mgmapi/ndb_logevent.cpp
  storage/ndb/src/mgmsrv/ConfigInfo.cpp

=== modified file 'storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp	2008-08-21 14:04:53 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp	2008-08-21 16:10:55 +0000
@@ -2058,7 +2058,7 @@ public:
   Uint32 logMBytesInitDone;
 
   Uint32 m_startup_report_frequency;
-  Uint32 m_next_report_time;
+  NDB_TICKS m_next_report_time;
  
 public:
   Dblqh(Block_context& ctx, Uint32 instanceNumber = 0);

=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2008-08-21 14:04:53 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2008-08-21 16:10:55 +0000
@@ -20444,21 +20444,21 @@ void Dblqh::writeDbgInfoPageHeader(LogPa
 }
 
 void Dblqh::initReportStatus(Signal* signal){
-  struct timeval the_time;
-  gettimeofday(&the_time,0);
-  m_next_report_time = the_time.tv_sec + m_startup_report_frequency;
+  NDB_TICKS current_time = NdbTick_CurrentMillisecond();
+  m_next_report_time = current_time + 
+                       ((NDB_TICKS)m_startup_report_frequency) * ((NDB_TICKS)1000);
 }
 
 void Dblqh::checkReportStatus(Signal* signal){
   if (m_startup_report_frequency == 0)
     return;
 
-  struct timeval the_time;
-  gettimeofday(&the_time, 0);
-  if (the_time.tv_sec > m_next_report_time)
+  NDB_TICKS current_time = NdbTick_CurrentMillisecond();
+  if (current_time > m_next_report_time)
   {
     reportStatus(signal);
-    m_next_report_time = the_time.tv_sec + m_startup_report_frequency;
+    m_next_report_time = current_time +
+                         ((NDB_TICKS)m_startup_report_frequency) * ((NDB_TICKS)1000);
   }
 }