summaryrefslogtreecommitdiff
path: root/ndb/src/kernel
diff options
context:
space:
mode:
authorunknown <tomas@poseidon.ndb.mysql.com>2005-01-12 22:09:43 +0100
committerunknown <tomas@poseidon.ndb.mysql.com>2005-01-12 22:09:43 +0100
commit54ccf5d16c5c25ec4d59b98e9ae29bb391f18a63 (patch)
tree61dd4cd07f538cc3d1a948dc5eb7a89389611524 /ndb/src/kernel
parent1454564f1c481e4ec8afe9be01064574064d8479 (diff)
downloadmariadb-git-54ccf5d16c5c25ec4d59b98e9ae29bb391f18a63.tar.gz
added som signal printout functions
search for subscriber should be done on nodeid basis and not reference, only one subscriber per event per nodeid allowed not necessarily the same starts and stops... +error corrected in ref signal added print of error codes + more correct error handling of event errors + added goto instead of erroneous break to fix bug#7627 ndb/include/kernel/signaldata/SignalData.hpp: added som signal printout functions ndb/src/common/debugger/signaldata/SignalDataPrint.cpp: added som signal printout functions ndb/src/common/debugger/signaldata/SignalNames.cpp: added som signal printout functions ndb/src/common/debugger/signaldata/SumaImpl.cpp: added som signal printout functions ndb/src/kernel/blocks/suma/Suma.cpp: search for subscriber should be done on nodeid basis and not reference, only one subscriber per event per nodeid allowed not necessarily the same starts and stops... +error corrected in ref signal ndb/src/ndbapi/NdbDictionaryImpl.cpp: indentation event error handling debug printouts ndb/src/ndbapi/NdbEventOperationImpl.cpp: debug printouts + added goto instead of erroneous break to fix bug#7627 ndb/test/src/HugoTransactions.cpp: added print of error codes + more correct error handling of event errors
Diffstat (limited to 'ndb/src/kernel')
-rw-r--r--ndb/src/kernel/blocks/suma/Suma.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/ndb/src/kernel/blocks/suma/Suma.cpp b/ndb/src/kernel/blocks/suma/Suma.cpp
index 44ac054dd67..754832cd954 100644
--- a/ndb/src/kernel/blocks/suma/Suma.cpp
+++ b/ndb/src/kernel/blocks/suma/Suma.cpp
@@ -3280,7 +3280,7 @@ SumaParticipant::execSUB_STOP_REQ(Signal* signal){
for (;!subbPtr.isNull(); c_dataSubscribers.next(subbPtr)){
jam();
if (subbPtr.p->m_subPtrI == subPtr.i &&
- subbPtr.p->m_subscriberRef == subscriberRef &&
+ refToNode(subbPtr.p->m_subscriberRef) == refToNode(subscriberRef) &&
subbPtr.p->m_subscriberData == subscriberData){
// ndbout_c("STOP_REQ: before c_dataSubscribers.release");
jam();
@@ -3508,6 +3508,8 @@ SumaParticipant::sendSubRemoveRef(Signal* signal, const SubRemoveReq& req,
jam();
SubRemoveRef * ref = (SubRemoveRef *)signal->getDataPtrSend();
ref->senderRef = reference();
+ ref->subscriptionId = req.subscriptionId;
+ ref->subscriptionKey = req.subscriptionKey;
ref->senderData = req.senderData;
ref->err = errCode;
if (temporary)