Merge willster.(none):/home/stewart/Documents/MySQL/5.1/cleanup

into willster.(none):/home/stewart/Documents/MySQL/5.1/pending

Merge willster.(none):/home/stewart/Documents/MySQL/5.1/cleanup
into willster.(none):/home/stewart/Documents/MySQL/5.1/pending
838e6164 · stewart@willster.(none) · 1ecc88b1 · b33a185b · 838e6164 · 838e6164
Commit 838e6164 authored Oct 04, 2006 by stewart@willster.(none)
2 changed files
--- a/storage/ndb/src/common/debugger/signaldata/SignalNames.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/SignalNames.cpp
@@ -633,5 +633,6 @@ const GsnName SignalNames [] = {
  ,{ GSN_DICT_LOCK_REF,          "DICT_LOCK_REF" }
  ,{ GSN_DICT_UNLOCK_ORD,        "DICT_UNLOCK_ORD" }
+  ,{ GSN_DICT_COMMIT_REQ,  "DICT_COMMIT_REQ"}
 };
 const unsigned short NO_OF_SIGNAL_NAMES = sizeof(SignalNames)/sizeof(GsnName);
--- a/storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp
+++ b/storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp
@@ -34,8 +34,8 @@
 /**
 * No of 32 bits word in sysfile
- * 
+ *
- *   5 + 
+ *   6 +                                           // was 5 in < version 5.1
 *   MAX_NDB_NODES +                               // lastCompletedGCI
 *   NODE_ARRAY_SIZE(MAX_NDB_NODES, 4) +           // nodeStatus
 *   NODE_ARRAY_SIZE(MAX_NDB_NODES, NODEID_BITS) + // nodeGroups