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

Merge mysql.com:/home/jonas/src/fix

Browse Source 
into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
This commit is contained in:
unknown
2005-02-25 09:14:43 +01:00
parent 92e3070ca3 b89feadf56
commit 52902cb849
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_indexVersion;
Uint32 m_errorCode; Uint32 m_errorCode;
Uint32 m_errorLine; Uint32 m_errorLine;
Uint32 m_errorNode; union {
Uint32 m_errorNode;
Uint32 masterNodeId; // if NotMaster
};
public: public:
AlterIndxConf* getConf() { AlterIndxConf* getConf() {
return &m_conf; return &m_conf;

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

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

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

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

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

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

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

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

1
ndb/src/kernel/blocks/dbdict/Dbdict.cpp
View File

@ -10237,6 +10237,7 @@ Dbdict::buildIndex_sendReply(Signal* signal, OpBuildIndexPtr opPtr,
rep->setIndexId(opPtr.p->m_request.getIndexId()); rep->setIndexId(opPtr.p->m_request.getIndexId());
if (sendRef) { if (sendRef) {
rep->setErrorCode(opPtr.p->m_errorCode); rep->setErrorCode(opPtr.p->m_errorCode);
rep->masterNodeId = opPtr.p->m_errorNode;
gsn = GSN_BUILDINDXREF; gsn = GSN_BUILDINDXREF;
length = BuildIndxRef::SignalLength; length = BuildIndxRef::SignalLength;
} }

4
ndb/src/ndbapi/NdbDictionaryImpl.cpp
View File

@ -2125,7 +2125,7 @@ NdbDictInterface::execCREATE_INDX_REF(NdbApiSignal * signal,
const CreateIndxRef* const ref = CAST_CONSTPTR(CreateIndxRef, signal->getDataPtr()); const CreateIndxRef* const ref = CAST_CONSTPTR(CreateIndxRef, signal->getDataPtr());
m_error.code = ref->getErrorCode(); m_error.code = ref->getErrorCode();
if(m_error.code == ref->NotMaster) if(m_error.code == ref->NotMaster)
m_masterNodeId= ref->m_errorNode; m_masterNodeId= ref->masterNodeId;
m_waiter.signal(NO_WAIT); m_waiter.signal(NO_WAIT);
} }
@ -2251,7 +2251,7 @@ NdbDictInterface::execDROP_INDX_REF(NdbApiSignal * signal,
const DropIndxRef* const ref = CAST_CONSTPTR(DropIndxRef, signal->getDataPtr()); const DropIndxRef* const ref = CAST_CONSTPTR(DropIndxRef, signal->getDataPtr());
m_error.code = ref->getErrorCode(); m_error.code = ref->getErrorCode();
if(m_error.code == ref->NotMaster) if(m_error.code == ref->NotMaster)
m_masterNodeId= ref->m_errorNode; m_masterNodeId= ref->masterNodeId;
m_waiter.signal(NO_WAIT); m_waiter.signal(NO_WAIT);
} }