Commit 4935b27c authored by unknown's avatar unknown
Browse files

merge

parent 80c1bddd

ndb/src/kernel/vm/SimulatedBlock.hpp

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ typedef struct NewVar 
} NewVARIABLE;  /* 128 bits */



class SimulatedBlock {

  friend class MutexManager;

  friend class SafeCounter;

  friend class SafeCounterManager;

  friend struct UpgradeStartup;
@@ -469,6 +468,7 @@ public: 
    void progError(int line, int err_code, const char* extra = 0);

  };

  

  friend class MutexManager;

  MutexManager c_mutexMgr;



  void ignoreMutexUnlockCallback(Signal* signal, Uint32 ptrI, Uint32 retVal);

ndb/src/mgmsrv/ConfigInfo.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1730,9 +1730,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    "NodeId1",

    "SHM",

    "Id of node ("DB_TOKEN_PRINT", "API_TOKEN_PRINT" or "MGM_TOKEN_PRINT") on one side of the connection",

    ConfigInfo::USED,

    ConfigInfo::CI_USED,

    false,

    ConfigInfo::STRING,

    ConfigInfo::CI_STRING,

    MANDATORY,

    0, 0 },