Skip to content

M
mariadb
Commit b99c878c authored by tomas@poseidon.ndb.mysql.com's avatar tomas@poseidon.ndb.mysql.com
Browse files
Options

Suma.cpp: 

  same as prev fix, wrong read of 64 bit value
parent dcfa0291
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
ndb/src/kernel/blocks/suma/Suma.cpp
View file @ b99c878c
...@@ -824,7 +824,8 @@ Suma::execUTIL_SEQUENCE_CONF(Signal* signal) ...@@ -824,7 +824,8 @@ Suma::execUTIL_SEQUENCE_CONF(Signal* signal)
return; return;
} }
Uint32 subId = conf->sequenceValue[0]; Uint64 subId;
memcpy(&subId,conf->sequenceValue,8);
Uint32 subData = conf->senderData; Uint32 subData = conf->senderData;
SubscriberPtr subbPtr; SubscriberPtr subbPtr;
...@@ -832,8 +833,8 @@ Suma::execUTIL_SEQUENCE_CONF(Signal* signal) ...@@ -832,8 +833,8 @@ Suma::execUTIL_SEQUENCE_CONF(Signal* signal)
CreateSubscriptionIdConf * subconf = (CreateSubscriptionIdConf*)conf; CreateSubscriptionIdConf * subconf = (CreateSubscriptionIdConf*)conf;
subconf->subscriptionId = subId; subconf->subscriptionId = (Uint32)subId;
subconf->subscriptionKey =(getOwnNodeId() << 16) | (subId & 0xFFFF); subconf->subscriptionKey =(getOwnNodeId() << 16) | (Uint32)(subId & 0xFFFF);
subconf->subscriberData = subbPtr.p->m_senderData; subconf->subscriberData = subbPtr.p->m_senderData;
sendSignal(subbPtr.p->m_subscriberRef, GSN_CREATE_SUBID_CONF, signal, sendSignal(subbPtr.p->m_subscriberRef, GSN_CREATE_SUBID_CONF, signal,
......
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