mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
merge
This commit is contained in:
parent
80c1bddd1b
commit
4935b27c47
2 changed files with 4 additions and 4 deletions
|
@ -76,7 +76,6 @@ typedef struct NewVar
|
|||
} NewVARIABLE; /* 128 bits */
|
||||
|
||||
class SimulatedBlock {
|
||||
friend class MutexManager;
|
||||
friend class SafeCounter;
|
||||
friend class SafeCounterManager;
|
||||
friend struct UpgradeStartup;
|
||||
|
@ -468,7 +467,8 @@ public:
|
|||
BlockReference reference() const;
|
||||
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);
|
||||
|
|
|
@ -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 },
|
||||
|
||||
|
|
Loading…
Reference in a new issue