diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-03-09 01:00:08 +0100 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-03-09 01:00:08 +0100 |
| commit | 732a0ec4009a89b53752ce2852da43b02805dbc3 (patch) | |
| tree | 5b9b3216b4d1aedb366bb45a37cf372e79de8707 | |
| parent | 7adae6b37ace9f3d1cd7130e8a4b64cab1cd376b (diff) | |
| download | mariadb-git-732a0ec4009a89b53752ce2852da43b02805dbc3.tar.gz | |
fixed bug in event handling of several tables
fix crashing bug in Dict caused by Suma on CREATE_SUBID_REF
ndb/include/kernel/signaldata/SumaImpl.hpp:
fix crashing bug in Dict caused by Suma on CREATE_SUBID_REF
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
fixed bug in event handling of several tables
| -rw-r--r-- | ndb/include/kernel/signaldata/SumaImpl.hpp | 2 | ||||
| -rw-r--r-- | ndb/src/ndbapi/NdbEventOperationImpl.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ndb/include/kernel/signaldata/SumaImpl.hpp b/ndb/include/kernel/signaldata/SumaImpl.hpp index 89ade067dcd..75fb65e1ad2 100644 --- a/ndb/include/kernel/signaldata/SumaImpl.hpp +++ b/ndb/include/kernel/signaldata/SumaImpl.hpp @@ -592,11 +592,11 @@ public: Uint32 subscriptionId; Uint32 subscriptionKey; - Uint32 err; union { // Haven't decide what to call it Uint32 senderData; Uint32 subscriberData; }; + Uint32 err; }; class SumaStartMe { diff --git a/ndb/src/ndbapi/NdbEventOperationImpl.cpp b/ndb/src/ndbapi/NdbEventOperationImpl.cpp index 657c2a84417..b00b0d82cba 100644 --- a/ndb/src/ndbapi/NdbEventOperationImpl.cpp +++ b/ndb/src/ndbapi/NdbEventOperationImpl.cpp @@ -84,6 +84,8 @@ NdbEventOperationImpl::NdbEventOperationImpl(NdbEventOperation &N, m_eventImpl = &myEvnt->m_impl; + m_eventId = m_eventImpl->m_eventId; + m_bufferHandle = m_ndb->getGlobalEventBufferHandle(); if (m_bufferHandle->m_bufferL > 0) m_bufferL =m_bufferHandle->m_bufferL; @@ -947,6 +949,7 @@ NdbGlobalEventBuffer::real_prepareAddSubscribeEvent int bufferId= -1; Uint32 eventId= eventOp->m_eventId; + DBUG_PRINT("enter",("eventId: %u", eventId)); // add_drop_lock(); // only one thread can do add or drop at a time // Find place where eventId already set |