1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new

Browse Source 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
This commit is contained in:
unknown 2006-03-22 18:12:10 +01:00
commit 5ae7cf461e
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
storage/ndb/src/kernel/blocks/suma/Suma.cpp
View File

@ -2565,9 +2565,10 @@ Suma::reportAllSubscribers(Signal *signal,
return; return;
} }
#ifdef VM_TRACE //#ifdef VM_TRACE
ndbout_c("reportAllSubscribers"); ndbout_c("reportAllSubscribers subPtr.i: %d subPtr.p->n_subscribers: %d",
#endif subPtr.i, subPtr.p->n_subscribers);
//#endif
SubTableData * data = (SubTableData*)signal->getDataPtrSend(); SubTableData * data = (SubTableData*)signal->getDataPtrSend();
data->gci = m_last_complete_gci + 1; data->gci = m_last_complete_gci + 1;
data->tableId = subPtr.p->m_tableId; data->tableId = subPtr.p->m_tableId;
@ -2588,18 +2589,28 @@ Suma::reportAllSubscribers(Signal *signal,
data->senderData = i_subbPtr.p->m_senderData; data->senderData = i_subbPtr.p->m_senderData;
sendSignal(i_subbPtr.p->m_senderRef, GSN_SUB_TABLE_DATA, signal, sendSignal(i_subbPtr.p->m_senderRef, GSN_SUB_TABLE_DATA, signal,
SubTableData::SignalLength, JBB); SubTableData::SignalLength, JBB);
//#ifdef VM_TRACE
ndbout_c("sent %s(%d) to node %d, req_nodeid: %d senderData: %d",
table_event == NdbDictionary::Event::_TE_SUBSCRIBE ?
"SUBSCRIBE" : "UNSUBSCRIBE", (int) table_event,
refToNode(i_subbPtr.p->m_senderRef),
data->req_nodeid, data->senderData
);
//#endif
if (i_subbPtr.i != subbPtr.i) if (i_subbPtr.i != subbPtr.i)
{ {
data->req_nodeid = refToNode(i_subbPtr.p->m_senderRef); data->req_nodeid = refToNode(i_subbPtr.p->m_senderRef);
data->senderData = subbPtr.p->m_senderData; data->senderData = subbPtr.p->m_senderData;
sendSignal(subbPtr.p->m_senderRef, GSN_SUB_TABLE_DATA, signal, sendSignal(subbPtr.p->m_senderRef, GSN_SUB_TABLE_DATA, signal,
SubTableData::SignalLength, JBB); SubTableData::SignalLength, JBB);
#ifdef VM_TRACE //#ifdef VM_TRACE
ndbout_c("sent %s(%d) to node %d", ndbout_c("sent %s(%d) to node %d, req_nodeid: %d senderData: %d",
table_event == NdbDictionary::Event::_TE_SUBSCRIBE ? table_event == NdbDictionary::Event::_TE_SUBSCRIBE ?
"SUBSCRIBE" : "UNSUBSCRIBE", (int) table_event, "SUBSCRIBE" : "UNSUBSCRIBE", (int) table_event,
refToNode(subbPtr.p->m_senderRef)); refToNode(subbPtr.p->m_senderRef),
#endif data->req_nodeid, data->senderData
);
//#endif
} }
} }
} }