mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-09 16:44:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
This commit is contained in:
mskold@mysql.com 2005-02-25 13:21:17 +01:00
commit 78627e1ab1
8 changed files with 66 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

45
.bzrignore
View file

@ -775,13 +775,45 @@ ndb/lib/libNEWTON_BASICTEST_COMMON.so
ndb/lib/libREP_API.so
ndb/lib/libndbclient.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/portlib/libportlib.dsp
ndb/src/common/transporter/libtransporter.dsp
ndb/src/common/util/libgeneral.dsp
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/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.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.dsp
ndb/src/mgmclient/test_cpcd/*.d
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/bankMakeGL
ndb/test/ndbapi/bank/bankSumAccounts
@ -794,12 +826,15 @@ ndb/test/ndbapi/create_tab
ndb/test/ndbapi/drop_all_tabs
ndb/test/ndbapi/flexAsynch
ndb/test/ndbapi/flexBench
ndb/test/ndbapi/flexBench.dsp
ndb/test/ndbapi/flexHammer
ndb/test/ndbapi/flexTT
ndb/test/ndbapi/testBackup
ndb/test/ndbapi/testBasic
ndb/test/ndbapi/testBasic.dsp
ndb/test/ndbapi/testBasicAsynch
ndb/test/ndbapi/testBlobs
ndb/test/ndbapi/testBlobs.dsp
ndb/test/ndbapi/testDataBuffers
ndb/test/ndbapi/testDeadlock
ndb/test/ndbapi/testDict
@ -811,6 +846,7 @@ ndb/test/ndbapi/testOIBasic
ndb/test/ndbapi/testOperations
ndb/test/ndbapi/testRestartGci
ndb/test/ndbapi/testScan
ndb/test/ndbapi/testScan.dsp
ndb/test/ndbapi/testScanInterpreter
ndb/test/ndbapi/testScanPerf
ndb/test/ndbapi/testSystemRestart
@ -818,6 +854,7 @@ ndb/test/ndbapi/testTimeout
ndb/test/ndbapi/testTransactions
ndb/test/ndbapi/test_event
ndb/test/run-test/atrt
ndb/test/src/libNDBT.dsp
ndb/test/tools/copy_tab
ndb/test/tools/create_index
ndb/test/tools/hugoCalculator
@ -834,15 +871,23 @@ ndb/test/tools/ndb_cpcc
ndb/test/tools/restart
ndb/test/tools/verify_index
ndb/tools/ndb_delete_all
ndb/tools/ndb_delete_all.dsp
ndb/tools/ndb_desc
ndb/tools/ndb_desc.dsp
ndb/tools/ndb_drop_index
ndb/tools/ndb_drop_index.dsp
ndb/tools/ndb_drop_table
ndb/tools/ndb_drop_table.dsp
ndb/tools/ndb_restore
ndb/tools/ndb_select_all
ndb/tools/ndb_select_all.dsp
ndb/tools/ndb_select_count
ndb/tools/ndb_select_count.dsp
ndb/tools/ndb_show_tables
ndb/tools/ndb_show_tables.dsp
ndb/tools/ndb_test_platform
ndb/tools/ndb_waiter
ndb/tools/ndb_waiter.dsp
ndbcluster-1186
ndbcluster-1186/SCCS
ndbcluster-1186/config.ini

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;

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

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

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

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