mirror of
https://github.com/MariaDB/server.git
synced 2025-01-24 07:44:22 +01:00
Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/eric/fed-txn-mysql-5.1-new
This commit is contained in:
commit
ee39b6ab9a
1 changed files with 5 additions and 5 deletions
|
@ -855,6 +855,11 @@ find_bucket(Vector<Gci_container> * active, Uint64 gci)
|
|||
void
|
||||
NdbEventBuffer::execSUB_GCP_COMPLETE_REP(const SubGcpCompleteRep * const rep)
|
||||
{
|
||||
if (unlikely(m_active_op_count == 0))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
DBUG_ENTER("NdbEventBuffer::execSUB_GCP_COMPLETE_REP");
|
||||
|
||||
const Uint64 gci= rep->gci;
|
||||
|
@ -862,11 +867,6 @@ NdbEventBuffer::execSUB_GCP_COMPLETE_REP(const SubGcpCompleteRep * const rep)
|
|||
|
||||
Gci_container *bucket = find_bucket(&m_active_gci, gci);
|
||||
|
||||
if (unlikely(m_active_op_count == 0))
|
||||
{
|
||||
DBUG_VOID_RETURN;
|
||||
}
|
||||
|
||||
if (unlikely(bucket == 0))
|
||||
{
|
||||
/**
|
||||
|
|
Loading…
Add table
Reference in a new issue