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

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


storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  merge

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);

storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp

@@ -35,7 +35,7 @@
 /**
  * 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