Commit 3a12a1a9 authored by unknown's avatar unknown
Browse files

Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-1.2167.1.2 

into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-bug18781


storage/ndb/include/kernel/GlobalSignalNumbers.h:
  auto
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  SCCS merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  auto
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  auto
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  manual
parents 619d8b2c f98f5d63

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

+2 −0
Original line number Diff line number Diff line
@@ -365,6 +365,8 @@ const GsnName SignalNames [] = { 
  ,{ GSN_EVENT_SUBSCRIBE_REF,    "EVENT_SUBSCRIBE_REF" }

  ,{ GSN_DUMP_STATE_ORD,         "DUMP_STATE_ORD" }



  ,{ GSN_NODE_START_REP, "NODE_START_REP" }



  ,{ GSN_START_INFOREQ,  "START_INFOREQ" }

  ,{ GSN_START_INFOREF,  "START_INFOREF" }

  ,{ GSN_START_INFOCONF, "START_INFOCONF" }