Skip to content

M
mariadb
Commit 613d326a authored by unknown's avatar unknown
Browse files
Options

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb


ndb/include/kernel/signaldata/CreateIndx.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents 0d9ba267 c5d4d50a
Show whitespace changes
Inline Side-by-side
Showing with 66 additions and 12 deletions
.bzrignore
View file @ 613d326a
...@@ -775,13 +775,45 @@ ndb/lib/libNEWTON_BASICTEST_COMMON.so ...@@ -775,13 +775,45 @@ ndb/lib/libNEWTON_BASICTEST_COMMON.so
ndb/lib/libREP_API.so ndb/lib/libREP_API.so
ndb/lib/libndbclient.so ndb/lib/libndbclient.so
ndb/lib/libndbclient_extra.so ndb/lib/libndbclient_extra.so
ndb/src/common/debugger/libtrace.dsp
ndb/src/common/debugger/signaldata/libsignaldataprint.dsp
ndb/src/common/logger/liblogger.dsp
ndb/src/common/mgmcommon/libmgmsrvcommon.dsp
ndb/src/common/mgmcommon/printConfig/*.d ndb/src/common/mgmcommon/printConfig/*.d
ndb/src/common/portlib/libportlib.dsp
ndb/src/common/transporter/libtransporter.dsp
ndb/src/common/util/libgeneral.dsp
ndb/src/cw/cpcd/ndb_cpcd ndb/src/cw/cpcd/ndb_cpcd
ndb/src/kernel/blocks/backup/libbackup.dsp
ndb/src/kernel/blocks/backup/restore/ndb_restore ndb/src/kernel/blocks/backup/restore/ndb_restore
ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp
ndb/src/kernel/blocks/dbacc/libdbacc.dsp
ndb/src/kernel/blocks/dbdict/libdbdict.dsp
ndb/src/kernel/blocks/dbdih/libdbdih.dsp
ndb/src/kernel/blocks/dblqh/libdblqh.dsp
ndb/src/kernel/blocks/dbtc/libdbtc.dsp
ndb/src/kernel/blocks/dbtup/libdbtup.dsp
ndb/src/kernel/blocks/dbtux/libdbtux.dsp
ndb/src/kernel/blocks/dbutil/libdbutil.dsp
ndb/src/kernel/blocks/grep/libgrep.dsp
ndb/src/kernel/blocks/ndbcntr/libndbcntr.dsp
ndb/src/kernel/blocks/ndbfs/libndbfs.dsp
ndb/src/kernel/blocks/qmgr/libqmgr.dsp
ndb/src/kernel/blocks/suma/libsuma.dsp
ndb/src/kernel/blocks/trix/libtrix.dsp
ndb/src/kernel/error/liberror.dsp
ndb/src/kernel/ndbd ndb/src/kernel/ndbd
ndb/src/kernel/ndbd.dsp
ndb/src/kernel/vm/libkernel.dsp
ndb/src/libndbclient.dsp
ndb/src/mgmapi/libmgmapi.dsp
ndb/src/mgmclient/libndbmgmclient.dsp
ndb/src/mgmclient/ndb_mgm ndb/src/mgmclient/ndb_mgm
ndb/src/mgmclient/ndb_mgm.dsp
ndb/src/mgmclient/test_cpcd/*.d ndb/src/mgmclient/test_cpcd/*.d
ndb/src/mgmsrv/ndb_mgmd ndb/src/mgmsrv/ndb_mgmd
ndb/src/mgmsrv/ndb_mgmd.dsp
ndb/src/ndbapi/libndbapi.dsp
ndb/test/ndbapi/bank/bankCreator ndb/test/ndbapi/bank/bankCreator
ndb/test/ndbapi/bank/bankMakeGL ndb/test/ndbapi/bank/bankMakeGL
ndb/test/ndbapi/bank/bankSumAccounts ndb/test/ndbapi/bank/bankSumAccounts
...@@ -794,12 +826,15 @@ ndb/test/ndbapi/create_tab ...@@ -794,12 +826,15 @@ ndb/test/ndbapi/create_tab
ndb/test/ndbapi/drop_all_tabs ndb/test/ndbapi/drop_all_tabs
ndb/test/ndbapi/flexAsynch ndb/test/ndbapi/flexAsynch
ndb/test/ndbapi/flexBench ndb/test/ndbapi/flexBench
ndb/test/ndbapi/flexBench.dsp
ndb/test/ndbapi/flexHammer ndb/test/ndbapi/flexHammer
ndb/test/ndbapi/flexTT ndb/test/ndbapi/flexTT
ndb/test/ndbapi/testBackup ndb/test/ndbapi/testBackup
ndb/test/ndbapi/testBasic ndb/test/ndbapi/testBasic
ndb/test/ndbapi/testBasic.dsp
ndb/test/ndbapi/testBasicAsynch ndb/test/ndbapi/testBasicAsynch
ndb/test/ndbapi/testBlobs ndb/test/ndbapi/testBlobs
ndb/test/ndbapi/testBlobs.dsp
ndb/test/ndbapi/testDataBuffers ndb/test/ndbapi/testDataBuffers
ndb/test/ndbapi/testDeadlock ndb/test/ndbapi/testDeadlock
ndb/test/ndbapi/testDict ndb/test/ndbapi/testDict
...@@ -811,6 +846,7 @@ ndb/test/ndbapi/testOIBasic ...@@ -811,6 +846,7 @@ ndb/test/ndbapi/testOIBasic
ndb/test/ndbapi/testOperations ndb/test/ndbapi/testOperations
ndb/test/ndbapi/testRestartGci ndb/test/ndbapi/testRestartGci
ndb/test/ndbapi/testScan ndb/test/ndbapi/testScan
ndb/test/ndbapi/testScan.dsp
ndb/test/ndbapi/testScanInterpreter ndb/test/ndbapi/testScanInterpreter
ndb/test/ndbapi/testScanPerf ndb/test/ndbapi/testScanPerf
ndb/test/ndbapi/testSystemRestart ndb/test/ndbapi/testSystemRestart
...@@ -818,6 +854,7 @@ ndb/test/ndbapi/testTimeout ...@@ -818,6 +854,7 @@ ndb/test/ndbapi/testTimeout
ndb/test/ndbapi/testTransactions ndb/test/ndbapi/testTransactions
ndb/test/ndbapi/test_event ndb/test/ndbapi/test_event
ndb/test/run-test/atrt ndb/test/run-test/atrt
ndb/test/src/libNDBT.dsp
ndb/test/tools/copy_tab ndb/test/tools/copy_tab
ndb/test/tools/create_index ndb/test/tools/create_index
ndb/test/tools/hugoCalculator ndb/test/tools/hugoCalculator
...@@ -834,15 +871,23 @@ ndb/test/tools/ndb_cpcc ...@@ -834,15 +871,23 @@ ndb/test/tools/ndb_cpcc
ndb/test/tools/restart ndb/test/tools/restart
ndb/test/tools/verify_index ndb/test/tools/verify_index
ndb/tools/ndb_delete_all ndb/tools/ndb_delete_all
ndb/tools/ndb_delete_all.dsp
ndb/tools/ndb_desc ndb/tools/ndb_desc
ndb/tools/ndb_desc.dsp
ndb/tools/ndb_drop_index ndb/tools/ndb_drop_index
ndb/tools/ndb_drop_index.dsp
ndb/tools/ndb_drop_table ndb/tools/ndb_drop_table
ndb/tools/ndb_drop_table.dsp
ndb/tools/ndb_restore ndb/tools/ndb_restore
ndb/tools/ndb_select_all ndb/tools/ndb_select_all
ndb/tools/ndb_select_all.dsp
ndb/tools/ndb_select_count ndb/tools/ndb_select_count
ndb/tools/ndb_select_count.dsp
ndb/tools/ndb_show_tables ndb/tools/ndb_show_tables
ndb/tools/ndb_show_tables.dsp
ndb/tools/ndb_test_platform ndb/tools/ndb_test_platform
ndb/tools/ndb_waiter ndb/tools/ndb_waiter
ndb/tools/ndb_waiter.dsp
ndbcluster-1186 ndbcluster-1186
ndbcluster-1186/SCCS ndbcluster-1186/SCCS
ndbcluster-1186/config.ini ndbcluster-1186/config.ini
......
ndb/include/kernel/signaldata/AlterIndx.hpp
View file @ 613d326a
...@@ -201,8 +201,10 @@ private: ...@@ -201,8 +201,10 @@ private:
//Uint32 m_indexVersion; //Uint32 m_indexVersion;
Uint32 m_errorCode; Uint32 m_errorCode;
Uint32 m_errorLine; Uint32 m_errorLine;
union {
Uint32 m_errorNode; Uint32 m_errorNode;
Uint32 masterNodeId; // if NotMaster
};
public: public:
AlterIndxConf* getConf() { AlterIndxConf* getConf() {
return &m_conf; return &m_conf;
......
ndb/include/kernel/signaldata/BuildIndx.hpp
View file @ 613d326a
...@@ -242,9 +242,8 @@ public: ...@@ -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: ...@@ -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() {
......
ndb/include/kernel/signaldata/CreateIndx.hpp
View file @ 613d326a
...@@ -220,8 +220,10 @@ public: ...@@ -220,8 +220,10 @@ public:
//Uint32 m_indexVersion; //Uint32 m_indexVersion;
Uint32 m_errorCode; Uint32 m_errorCode;
Uint32 m_errorLine; Uint32 m_errorLine;
union {
Uint32 m_errorNode; Uint32 m_errorNode;
Uint32 masterNodeId; // If NotMaster
};
public: public:
CreateIndxConf* getConf() { CreateIndxConf* getConf() {
return &m_conf; return &m_conf;
......
ndb/include/kernel/signaldata/CreateTrig.hpp
View file @ 613d326a
...@@ -311,8 +311,10 @@ private: ...@@ -311,8 +311,10 @@ private:
//Uint32 m_triggerInfo; //Uint32 m_triggerInfo;
Uint32 m_errorCode; Uint32 m_errorCode;
Uint32 m_errorLine; Uint32 m_errorLine;
union {
Uint32 m_errorNode; Uint32 m_errorNode;
Uint32 masterNodeId; // When NotMaster
};
public: public:
CreateTrigConf* getConf() { CreateTrigConf* getConf() {
return &m_conf; return &m_conf;
......
ndb/include/kernel/signaldata/DropIndx.hpp
View file @ 613d326a
...@@ -185,8 +185,10 @@ public: ...@@ -185,8 +185,10 @@ public:
//Uint32 m_indexVersion; //Uint32 m_indexVersion;
Uint32 m_errorCode; Uint32 m_errorCode;
Uint32 m_errorLine; Uint32 m_errorLine;
union {
Uint32 m_errorNode; Uint32 m_errorNode;
Uint32 masterNodeId;
};
public: public:
DropIndxConf* getConf() { DropIndxConf* getConf() {
return &m_conf; return &m_conf;
......
ndb/src/kernel/blocks/dbdict/Dbdict.cpp
View file @ 613d326a
...@@ -10309,6 +10309,7 @@ Dbdict::buildIndex_sendReply(Signal* signal, OpBuildIndexPtr opPtr, ...@@ -10309,6 +10309,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;
} }
......
ndb/src/ndbapi/NdbDictionaryImpl.cpp
View file @ 613d326a
...@@ -2211,7 +2211,7 @@ NdbDictInterface::execCREATE_INDX_REF(NdbApiSignal * signal, ...@@ -2211,7 +2211,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);
} }
...@@ -2337,7 +2337,7 @@ NdbDictInterface::execDROP_INDX_REF(NdbApiSignal * signal, ...@@ -2337,7 +2337,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);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7