Commit 3fdddf12 authored by unknown's avatar unknown

Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  mysql.com:/home/eric/fed-txn-mysql-5.1-new

parents b582ea2b 6a8eb801
...@@ -855,6 +855,11 @@ find_bucket(Vector<Gci_container> * active, Uint64 gci) ...@@ -855,6 +855,11 @@ find_bucket(Vector<Gci_container> * active, Uint64 gci)
void void
NdbEventBuffer::execSUB_GCP_COMPLETE_REP(const SubGcpCompleteRep * const rep) NdbEventBuffer::execSUB_GCP_COMPLETE_REP(const SubGcpCompleteRep * const rep)
{ {
if (unlikely(m_active_op_count == 0))
{
return;
}
DBUG_ENTER("NdbEventBuffer::execSUB_GCP_COMPLETE_REP"); DBUG_ENTER("NdbEventBuffer::execSUB_GCP_COMPLETE_REP");
const Uint64 gci= rep->gci; const Uint64 gci= rep->gci;
...@@ -862,11 +867,6 @@ NdbEventBuffer::execSUB_GCP_COMPLETE_REP(const SubGcpCompleteRep * const rep) ...@@ -862,11 +867,6 @@ NdbEventBuffer::execSUB_GCP_COMPLETE_REP(const SubGcpCompleteRep * const rep)
Gci_container *bucket = find_bucket(&m_active_gci, gci); Gci_container *bucket = find_bucket(&m_active_gci, gci);
if (unlikely(m_active_op_count == 0))
{
DBUG_VOID_RETURN;
}
if (unlikely(bucket == 0)) if (unlikely(bucket == 0))
{ {
/** /**
......
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