From 2ff26b97f20c6a44dd9ee8465372340756dd6772 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 15 Sep 2005 11:33:50 +0200 Subject: ndb-wl2325.patch storage/ndb/include/debugger/EventLogger.hpp: Import patch ndb-wl2325.patch storage/ndb/include/kernel/GlobalSignalNumbers.h: Import patch ndb-wl2325.patch storage/ndb/include/kernel/NodeInfo.hpp: Import patch ndb-wl2325.patch storage/ndb/include/kernel/signaldata/AlterTab.hpp: Import patch ndb-wl2325.patch storage/ndb/include/kernel/signaldata/CreateEvnt.hpp: Import patch ndb-wl2325.patch storage/ndb/include/kernel/signaldata/CreateTab.hpp: Import patch ndb-wl2325.patch storage/ndb/include/kernel/signaldata/DropTab.hpp: Import patch ndb-wl2325.patch storage/ndb/include/kernel/signaldata/EventReport.hpp: Import patch ndb-wl2325.patch storage/ndb/include/kernel/signaldata/SumaImpl.hpp: Import patch ndb-wl2325.patch storage/ndb/include/mgmapi/mgmapi.h: Import patch ndb-wl2325.patch storage/ndb/include/mgmapi/mgmapi_config_parameters.h: Import patch ndb-wl2325.patch storage/ndb/include/mgmapi/ndb_logevent.h: Import patch ndb-wl2325.patch storage/ndb/include/ndbapi/Ndb.hpp: Import patch ndb-wl2325.patch storage/ndb/include/ndbapi/NdbDictionary.hpp: Import patch ndb-wl2325.patch storage/ndb/include/ndbapi/NdbError.hpp: Import patch ndb-wl2325.patch storage/ndb/include/ndbapi/NdbEventOperation.hpp: Import patch ndb-wl2325.patch storage/ndb/include/ndbapi/ndb_cluster_connection.hpp: Import patch ndb-wl2325.patch storage/ndb/include/ndbapi/ndberror.h: Import patch ndb-wl2325.patch storage/ndb/ndbapi-examples/Makefile: Import patch ndb-wl2325.patch storage/ndb/src/common/debugger/EventLogger.cpp: Import patch ndb-wl2325.patch storage/ndb/src/common/debugger/Makefile.am: Import patch ndb-wl2325.patch storage/ndb/src/common/debugger/signaldata/SignalNames.cpp: Import patch ndb-wl2325.patch storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp: Import patch ndb-wl2325.patch storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp: Import patch ndb-wl2325.patch storage/ndb/src/kernel/SimBlockList.cpp: Import patch ndb-wl2325.patch storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Import patch ndb-wl2325.patch storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Import patch ndb-wl2325.patch storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp: Import patch ndb-wl2325.patch storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Import patch ndb-wl2325.patch storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Import patch ndb-wl2325.patch storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Import patch ndb-wl2325.patch storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp: Import patch ndb-wl2325.patch storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp: Import patch ndb-wl2325.patch storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp: Import patch ndb-wl2325.patch storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp: Import patch ndb-wl2325.patch storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp: Import patch ndb-wl2325.patch storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp: Import patch ndb-wl2325.patch storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Import patch ndb-wl2325.patch storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp: Import patch ndb-wl2325.patch storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp: Import patch ndb-wl2325.patch storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Import patch ndb-wl2325.patch storage/ndb/src/kernel/blocks/suma/Suma.cpp: Import patch ndb-wl2325.patch storage/ndb/src/kernel/blocks/suma/Suma.hpp: Import patch ndb-wl2325.patch storage/ndb/src/kernel/blocks/suma/SumaInit.cpp: Import patch ndb-wl2325.patch storage/ndb/src/kernel/blocks/trix/Trix.cpp: Import patch ndb-wl2325.patch storage/ndb/src/kernel/blocks/trix/Trix.hpp: Import patch ndb-wl2325.patch storage/ndb/src/kernel/vm/Configuration.cpp: Import patch ndb-wl2325.patch storage/ndb/src/kernel/vm/SimulatedBlock.cpp: Import patch ndb-wl2325.patch storage/ndb/src/kernel/vm/SimulatedBlock.hpp: Import patch ndb-wl2325.patch storage/ndb/src/mgmapi/mgmapi.cpp: Import patch ndb-wl2325.patch storage/ndb/src/mgmapi/ndb_logevent.cpp: Import patch ndb-wl2325.patch storage/ndb/src/mgmclient/CommandInterpreter.cpp: Import patch ndb-wl2325.patch storage/ndb/src/mgmsrv/MgmtSrvr.cpp: Import patch ndb-wl2325.patch storage/ndb/src/mgmsrv/MgmtSrvr.hpp: Import patch ndb-wl2325.patch storage/ndb/src/mgmsrv/Services.cpp: Import patch ndb-wl2325.patch storage/ndb/src/mgmsrv/Services.hpp: Import patch ndb-wl2325.patch storage/ndb/src/ndbapi/ClusterMgr.cpp: Import patch ndb-wl2325.patch storage/ndb/src/ndbapi/ClusterMgr.hpp: Import patch ndb-wl2325.patch storage/ndb/src/ndbapi/Ndb.cpp: Import patch ndb-wl2325.patch storage/ndb/src/ndbapi/NdbDictionary.cpp: Import patch ndb-wl2325.patch storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: Import patch ndb-wl2325.patch storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp: Import patch ndb-wl2325.patch storage/ndb/src/ndbapi/NdbEventOperation.cpp: Import patch ndb-wl2325.patch storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp: Import patch ndb-wl2325.patch storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp: Import patch ndb-wl2325.patch storage/ndb/src/ndbapi/NdbImpl.hpp: Import patch ndb-wl2325.patch storage/ndb/src/ndbapi/NdbWaiter.hpp: Import patch ndb-wl2325.patch storage/ndb/src/ndbapi/Ndberr.cpp: Import patch ndb-wl2325.patch storage/ndb/src/ndbapi/Ndbif.cpp: Import patch ndb-wl2325.patch storage/ndb/src/ndbapi/Ndbinit.cpp: Import patch ndb-wl2325.patch storage/ndb/src/ndbapi/ObjectMap.hpp: Import patch ndb-wl2325.patch storage/ndb/src/ndbapi/TransporterFacade.cpp: Import patch ndb-wl2325.patch storage/ndb/src/ndbapi/TransporterFacade.hpp: Import patch ndb-wl2325.patch storage/ndb/src/ndbapi/ndb_cluster_connection.cpp: Import patch ndb-wl2325.patch storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp: Import patch ndb-wl2325.patch storage/ndb/src/ndbapi/ndberror.c: Import patch ndb-wl2325.patch storage/ndb/test/include/HugoOperations.hpp: Import patch ndb-wl2325.patch storage/ndb/test/include/HugoTransactions.hpp: Import patch ndb-wl2325.patch storage/ndb/test/include/NDBT_Table.hpp: Import patch ndb-wl2325.patch storage/ndb/test/include/NDBT_Test.hpp: Import patch ndb-wl2325.patch storage/ndb/test/ndbapi/Makefile.am: Import patch ndb-wl2325.patch storage/ndb/test/ndbapi/bank/Bank.cpp: Import patch ndb-wl2325.patch storage/ndb/test/ndbapi/bank/Bank.hpp: Import patch ndb-wl2325.patch storage/ndb/test/ndbapi/bank/bankCreator.cpp: Import patch ndb-wl2325.patch storage/ndb/test/ndbapi/bank/bankMakeGL.cpp: Import patch ndb-wl2325.patch storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp: Import patch ndb-wl2325.patch storage/ndb/test/ndbapi/bank/bankTimer.cpp: Import patch ndb-wl2325.patch storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp: Import patch ndb-wl2325.patch storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp: Import patch ndb-wl2325.patch storage/ndb/test/ndbapi/bank/testBank.cpp: Import patch ndb-wl2325.patch storage/ndb/test/ndbapi/bench/asyncGenerator.cpp: Import patch ndb-wl2325.patch storage/ndb/test/ndbapi/bench/ndb_schema.hpp: Import patch ndb-wl2325.patch storage/ndb/test/ndbapi/test_event.cpp: Import patch ndb-wl2325.patch storage/ndb/test/ndbapi/test_event_multi_table.cpp: Import patch ndb-wl2325.patch storage/ndb/test/run-test/Makefile.am: Import patch ndb-wl2325.patch storage/ndb/test/run-test/daily-devel-tests.txt: Import patch ndb-wl2325.patch storage/ndb/test/src/HugoOperations.cpp: Import patch ndb-wl2325.patch storage/ndb/test/src/HugoTransactions.cpp: Import patch ndb-wl2325.patch storage/ndb/test/src/NDBT_ResultRow.cpp: Import patch ndb-wl2325.patch storage/ndb/test/src/NDBT_Tables.cpp: Import patch ndb-wl2325.patch storage/ndb/test/src/NDBT_Test.cpp: Import patch ndb-wl2325.patch storage/ndb/test/src/UtilTransactions.cpp: Import patch ndb-wl2325.patch storage/ndb/test/tools/Makefile.am: Import patch ndb-wl2325.patch --- storage/ndb/include/kernel/signaldata/EventReport.hpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'storage/ndb/include/kernel/signaldata/EventReport.hpp') diff --git a/storage/ndb/include/kernel/signaldata/EventReport.hpp b/storage/ndb/include/kernel/signaldata/EventReport.hpp index 9822a0539cf..e1cdbcfd753 100644 --- a/storage/ndb/include/kernel/signaldata/EventReport.hpp +++ b/storage/ndb/include/kernel/signaldata/EventReport.hpp @@ -68,21 +68,35 @@ public: 4) Add SentHeartbeat in EventLogger::getText() */ + void setNodeId(Uint32 nodeId); + Uint32 getNodeId() const; void setEventType(Ndb_logevent_type type); Ndb_logevent_type getEventType() const; UintR eventType; // DATA 0 }; +inline +void +EventReport::setNodeId(Uint32 nodeId){ + eventType = (nodeId << 16) | (eventType & 0xFFFF); +} + +inline +Uint32 +EventReport::getNodeId() const { + return eventType >> 16; +} + inline void EventReport::setEventType(Ndb_logevent_type type){ - eventType = (UintR) type; + eventType = (eventType & 0xFFFF0000) | (((UintR) type) & 0xFFFF); } inline Ndb_logevent_type EventReport::getEventType() const { - return (Ndb_logevent_type)eventType; + return (Ndb_logevent_type)(eventType & 0xFFFF); } #endif -- cgit v1.2.1