database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

BUG#8786 - ndb_autodiscover, post review

Browse Source 
More explicit naming of variables


ndb/include/kernel/signaldata/AlterIndx.hpp:
  Add union to indicate where master node is passed in ref
ndb/include/kernel/signaldata/BuildIndx.hpp:
  Add union to indicate where master node is passed in ref
ndb/include/kernel/signaldata/CreateIndx.hpp:
  Add union to indicate where master node is passed in ref
ndb/include/kernel/signaldata/CreateTrig.hpp:
  Add union to indicate where master node is passed in ref
ndb/include/kernel/signaldata/DropIndx.hpp:
  Add union to indicate where master node is passed in ref
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Set error/master node also on BuildIndxRef
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Use masterNodeId instead of errornode
This commit is contained in:
unknown
2005-02-25 09:10:35 +01:00
parent 6b38100d61
commit b89feadf56
7 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ndb/include/kernel/signaldata/AlterIndx.hpp
View File

@ -201,8 +201,10 @@ private:
//Uint32 m_indexVersion;
Uint32 m_errorCode;
Uint32 m_errorLine;
Uint32 m_errorNode;
union {
Uint32 m_errorNode;
Uint32 masterNodeId; // if NotMaster
};
public:
AlterIndxConf* getConf() {
return &m_conf;

4
ndb/include/kernel/signaldata/BuildIndx.hpp
View File

@ -242,9 +242,8 @@ public:
AllocationFailure = 4252,
InternalError = 4346
};
STATIC_CONST( SignalLength = BuildIndxConf::SignalLength + 1 );
STATIC_CONST( SignalLength = BuildIndxConf::SignalLength + 2 );
private:
//Uint32 m_userRef;
//Uint32 m_connectionPtr;
//Uint32 m_requestInfo;
@ -253,6 +252,7 @@ private:
//Uint32 m_indexId;
BuildIndxConf m_conf;
Uint32 m_errorCode;
Uint32 masterNodeId;
public:
BuildIndxConf* getConf() {

6
ndb/include/kernel/signaldata/CreateIndx.hpp
View File

@ -220,8 +220,10 @@ public:
//Uint32 m_indexVersion;
Uint32 m_errorCode;
Uint32 m_errorLine;
Uint32 m_errorNode;
union {
Uint32 m_errorNode;
Uint32 masterNodeId; // If NotMaster
};
public:
CreateIndxConf* getConf() {
return &m_conf;

6
ndb/include/kernel/signaldata/CreateTrig.hpp
View File

@ -311,8 +311,10 @@ private:
//Uint32 m_triggerInfo;
Uint32 m_errorCode;
Uint32 m_errorLine;
Uint32 m_errorNode;
union {
Uint32 m_errorNode;
Uint32 masterNodeId; // When NotMaster
};
public:
CreateTrigConf* getConf() {
return &m_conf;

6
ndb/include/kernel/signaldata/DropIndx.hpp
View File

@ -185,8 +185,10 @@ public:
//Uint32 m_indexVersion;
Uint32 m_errorCode;
Uint32 m_errorLine;
Uint32 m_errorNode;
union {
Uint32 m_errorNode;
Uint32 masterNodeId;
};
public:
DropIndxConf* getConf() {
return &m_conf;