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:
eric@mysql.com 2005-11-10 03:02:41 -08:00
commit ee39b6ab9a

View file

@ -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))
{
/**