summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorunknown <tomas@whalegate.ndb.mysql.com>2007-05-29 09:39:57 +0200
committerunknown <tomas@whalegate.ndb.mysql.com>2007-05-29 09:39:57 +0200
commit92bea0c329ded68b65978c5a563dc93350c9229d (patch)
tree845b57736dac78f6f3e329f31a575b20856882f3 /storage
parent4efc39f9aab2917a03642a6df3b57599ba769f6a (diff)
parent027b64f82142cd91856d9b7337d1be32d97d5009 (diff)
downloadmariadb-git-92bea0c329ded68b65978c5a563dc93350c9229d.tar.gz
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
Diffstat (limited to 'storage')
-rw-r--r--storage/ndb/src/kernel/vm/WatchDog.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/storage/ndb/src/kernel/vm/WatchDog.cpp b/storage/ndb/src/kernel/vm/WatchDog.cpp
index d1abb709b1e..2e24a5eaa6c 100644
--- a/storage/ndb/src/kernel/vm/WatchDog.cpp
+++ b/storage/ndb/src/kernel/vm/WatchDog.cpp
@@ -16,6 +16,7 @@
#include <ndb_global.h>
#include <my_pthread.h>
+#include <sys/times.h>
#include "WatchDog.hpp"
#include "GlobalData.hpp"
@@ -129,6 +130,13 @@ WatchDog::run(){
break;
}//switch
g_eventLogger.warning("Ndb kernel is stuck in: %s", last_stuck_action);
+ {
+ struct tms my_tms;
+ times(&my_tms);
+ g_eventLogger.info("User time: %llu System time: %llu",
+ (Uint64)my_tms.tms_utime,
+ (Uint64)my_tms.tms_stime);
+ }
if(alerts == 3){
shutdownSystem(last_stuck_action);
}