Commit ec8a3c07 authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged
parents 81aa1ca0 01a007a5

storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp

+16 −4
Original line number Diff line number Diff line
@@ -983,7 +983,7 @@ NdbEventOperationImpl::printAll() 
NdbEventBuffer::NdbEventBuffer(Ndb *ndb) :

  m_system_nodes(ndb->theImpl->theNoOfDBnodes),

  m_ndb(ndb),

  m_latestGCI(0),

  m_latestGCI(0), m_latest_complete_GCI(0),

  m_total_alloc(0),

  m_free_thresh(10),

  m_min_free_thresh(10),
@@ -1475,7 +1475,7 @@ NdbEventBuffer::execSUB_GCP_COMPLETE_REP(const SubGcpCompleteRep * const rep) 
                                      , m_flush_gci

#endif

                                      );



  Uint32 idx = bucket - (Gci_container*)m_active_gci.getBase();

  if (unlikely(bucket == 0))

  {

    /**
@@ -1520,8 +1520,20 @@ NdbEventBuffer::execSUB_GCP_COMPLETE_REP(const SubGcpCompleteRep * const rep) 
      }

      reportStatus();

      bzero(bucket, sizeof(Gci_container));

      if (likely(idx < ACTIVE_GCI_DIRECTORY_SIZE))

      {

        /**

         * Only "prepare" next GCI if we're in

         *   the first 4 highest GCI's...else

         *   this is somekind of "late" GCI...

         *   which is only initialized to 0

         *

         *   This to make sure we dont get several buckets with same GCI

         */

        bucket->m_gci = gci + ACTIVE_GCI_DIRECTORY_SIZE;

        bucket->m_gcp_complete_rep_count = m_system_nodes;

      }

      

      if(unlikely(m_latest_complete_GCI > gci))

      {

	complete_outof_order_gcis();