List:Commits« Previous MessageNext Message »
From:Jonas Oreland Date:October 13 2011 9:14am
Subject:bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4593 to 4594)
View as plain text  
 4594 Jonas Oreland	2011-10-13
      ndb - improve column comments on new ndb$info tables

    modified:
      storage/ndb/src/kernel/vm/NdbinfoTables.cpp
 4593 Pekka Nousiainen	2011-10-13 [merge]
      merge bug32040 to 7.0

    modified:
      storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp
=== modified file 'storage/ndb/src/kernel/vm/NdbinfoTables.cpp'
--- a/storage/ndb/src/kernel/vm/NdbinfoTables.cpp	2011-10-11 08:11:15 +0000
+++ b/storage/ndb/src/kernel/vm/NdbinfoTables.cpp	2011-10-13 09:13:33 +0000
@@ -172,68 +172,68 @@ DECLARE_NDBINFO_TABLE(DISKPAGEBUFFER, 9)
 DECLARE_NDBINFO_TABLE(THREADBLOCKS, 4) =
 { { "threadblocks", 4, 0, "which blocks are run in which threads" },
   {
-    {"node_id",                     Ndbinfo::Number, ""},
-    {"thr_no",                      Ndbinfo::Number, ""},
-    {"block_number",                Ndbinfo::Number, ""},
-    {"block_instance",              Ndbinfo::Number, ""},
+    {"node_id",                     Ndbinfo::Number, "node id"},
+    {"thr_no",                      Ndbinfo::Number, "thread number"},
+    {"block_number",                Ndbinfo::Number, "block number"},
+    {"block_instance",              Ndbinfo::Number, "block instance"},
   }
 };
 
 DECLARE_NDBINFO_TABLE(THREADSTAT, 18) =
-{ { "threadstat", 18, 0, "threadstat" },
+{ { "threadstat", 18, 0, "Statistics on execution threads" },
   {
     //{"0123456701234567"}
-    {"node_id",             Ndbinfo::Number, ""},
-    {"thr_no",              Ndbinfo::Number, ""},
-    {"thr_nm",              Ndbinfo::String, ""},
-    {"c_loop",              Ndbinfo::Number64,""},
-    {"c_exec",              Ndbinfo::Number64,""},
-    {"c_wait",              Ndbinfo::Number64,""},
-    {"c_l_sent_prioa",      Ndbinfo::Number64,""},
-    {"c_l_sent_priob",      Ndbinfo::Number64,""},
-    {"c_r_sent_prioa",      Ndbinfo::Number64,""},
-    {"c_r_sent_priob",      Ndbinfo::Number64,""},
-    {"os_tid",              Ndbinfo::Number64,""},
-    {"os_now",              Ndbinfo::Number64,""},
-    {"os_ru_utime",         Ndbinfo::Number64,""},
-    {"os_ru_stime",         Ndbinfo::Number64,""},
-    {"os_ru_minflt",        Ndbinfo::Number64,""},
-    {"os_ru_majflt",        Ndbinfo::Number64,""},
-    {"os_ru_nvcsw",         Ndbinfo::Number64,""},
-    {"os_ru_nivcsw",        Ndbinfo::Number64,""}
+    {"node_id",             Ndbinfo::Number, "node id"},
+    {"thr_no",              Ndbinfo::Number, "thread number"},
+    {"thr_nm",              Ndbinfo::String, "thread name"},
+    {"c_loop",              Ndbinfo::Number64,"No of loops in main loop"},
+    {"c_exec",              Ndbinfo::Number64,"No of signals executed"},
+    {"c_wait",              Ndbinfo::Number64,"No of times waited for more input"},
+    {"c_l_sent_prioa",      Ndbinfo::Number64,"No of prio A signals sent to own node"},
+    {"c_l_sent_priob",      Ndbinfo::Number64,"No of prio B signals sent to own node"},
+    {"c_r_sent_prioa",      Ndbinfo::Number64,"No of prio A signals sent to remote node"},
+    {"c_r_sent_priob",      Ndbinfo::Number64,"No of prio B signals sent to remote node"},
+    {"os_tid",              Ndbinfo::Number64,"OS thread id"},
+    {"os_now",              Ndbinfo::Number64,"OS gettimeofday (millis)"},
+    {"os_ru_utime",         Ndbinfo::Number64,"OS user CPU time (micros)"},
+    {"os_ru_stime",         Ndbinfo::Number64,"OS system CPU time (micros)"},
+    {"os_ru_minflt",        Ndbinfo::Number64,"OS page reclaims (soft page faults"},
+    {"os_ru_majflt",        Ndbinfo::Number64,"OS page faults (hard page faults)"},
+    {"os_ru_nvcsw",         Ndbinfo::Number64,"OS voluntary context switches"},
+    {"os_ru_nivcsw",        Ndbinfo::Number64,"OS involuntary context switches"}
   }
 };
 
 DECLARE_NDBINFO_TABLE(TRANSACTIONS, 10) =
 { { "transactions", 10, 0, "transactions" },
   {
-    {"node_id",             Ndbinfo::Number, ""},
-    {"block_instance",      Ndbinfo::Number, ""},
-    {"objid",               Ndbinfo::Number, ""},
-    {"apiref",              Ndbinfo::Number, ""},
-    {"transid",             Ndbinfo::String, ""},
-    {"state",               Ndbinfo::Number, ""},
-    {"flags",               Ndbinfo::Number, ""},
-    {"c_ops",               Ndbinfo::Number, "No of operations" },
-    {"outstanding",         Ndbinfo::Number, "Outstanding request" },
-    {"timer",               Ndbinfo::Number, "(in seconds)"},
+    {"node_id",             Ndbinfo::Number, "node id"},
+    {"block_instance",      Ndbinfo::Number, "TC instance no"},
+    {"objid",               Ndbinfo::Number, "Object id of transaction object"},
+    {"apiref",              Ndbinfo::Number, "API reference"},
+    {"transid",             Ndbinfo::String, "Transaction id"},
+    {"state",               Ndbinfo::Number, "Transaction state"},
+    {"flags",               Ndbinfo::Number, "Transaction flags"},
+    {"c_ops",               Ndbinfo::Number, "No of operations in transaction" },
+    {"outstanding",         Ndbinfo::Number, "Currently outstanding request" },
+    {"timer",               Ndbinfo::Number, "Timer (seconds)"},
   }
 };
 
 DECLARE_NDBINFO_TABLE(OPERATIONS, 11) =
 { { "operations", 11, 0, "operations" },
   {
-    {"node_id",             Ndbinfo::Number, ""},
-    {"block_instance",      Ndbinfo::Number, ""},
-    {"objid",               Ndbinfo::Number, ""},
-    {"tcref",               Ndbinfo::Number, ""},
-    {"apiref",              Ndbinfo::Number, ""},
-    {"transid",             Ndbinfo::String, ""},
-    {"tableid",             Ndbinfo::Number, ""},
-    {"fragmentid",          Ndbinfo::Number, ""},
-    {"op",                  Ndbinfo::Number, ""},
-    {"state",               Ndbinfo::Number, ""},
-    {"flags",               Ndbinfo::Number, ""}
+    {"node_id",             Ndbinfo::Number, "node id"},
+    {"block_instance",      Ndbinfo::Number, "LQH instance no"},
+    {"objid",               Ndbinfo::Number, "Object id of operation object"},
+    {"tcref",               Ndbinfo::Number, "TC reference"},
+    {"apiref",              Ndbinfo::Number, "API reference"},
+    {"transid",             Ndbinfo::String, "Transaction id"},
+    {"tableid",             Ndbinfo::Number, "Table id"},
+    {"fragmentid",          Ndbinfo::Number, "Fragment id"},
+    {"op",                  Ndbinfo::Number, "Operation type"},
+    {"state",               Ndbinfo::Number, "Operation state"},
+    {"flags",               Ndbinfo::Number, "Operation flags"}
   }
 };
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4593 to 4594) Jonas Oreland13 Oct