bk commit into 5.1 tree (tomas:1.1890)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1890 05/05/27 14:01:38 tomas@stripped +2 -0
  put the counters back for compatability reasons
  and to fix bug when compiling without VM_TRACE

  storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
    1.28 05/05/27 14:01:34 tomas@stripped +0 -2
    put the counters back for compatability reasons
    and to fix bug when compiling without VM_TRACE

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
    1.57 05/05/27 14:01:33 tomas@stripped +2 -11
    put the counters back for compatability reasons
    and to fix bug when compiling without VM_TRACE

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl2325

--- 1.56/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2005-05-26 16:43:00 +02:00
+++ 1.57/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2005-05-27 14:01:33 +02:00
@@ -760,9 +760,7 @@
       << "  state: " << hex << gci.m_state 
       << "  head: " << hex << gci.m_head
       << "  tail: " << hex << gci.m_tail
-#ifdef VM_TRACE
       << "  cnt: " << dec << gci.m_event_count
-#endif
       << "]";
   return out;
 }
@@ -856,9 +854,7 @@
 	}
 	
 	m_complete_data.m_tail = bucket->m_tail;
-#ifdef VM_TRACE
 	m_complete_data.m_event_count += bucket->m_event_count;
-#endif
       }
       bzero(bucket, sizeof(Gci_container));
       bucket->m_gci = gci + ACTIVE_GCI_DIRECTORY_SIZE;
@@ -932,8 +928,8 @@
       }
       
       m_complete_data.m_tail = bucket->m_tail;
-#ifdef VM_TRACE
       m_complete_data.m_event_count += bucket->m_event_count;
+#ifdef VM_TRACE
       ndbout_c("moved %lld rows -> %lld", bucket->m_event_count,
 	       m_complete_data.m_event_count);
 #else
@@ -1012,9 +1008,8 @@
       tmp->m_tail->m_next = m_free_data;
       m_free_data= tmp->m_head;
 
-#ifdef VM_TRACE
       m_free_data_count += tmp->m_event_count;
-#else
+#if 0
       m_free_data_count++;
       EventBufData* loop= tmp->m_head;
       while(loop != tmp->m_tail)
@@ -1146,9 +1141,7 @@
 #endif
       bucket->m_head = bucket->m_tail = data;
     }
-#ifdef VM_TRACE
     bucket->m_event_count++;
-#endif
 
     if (copy_data_alloc(sdata, ptr, data))
     {
@@ -1330,9 +1323,7 @@
       m_available_data= m_complete_data.m_head;
     }
     m_last_available_data= m_complete_data.m_tail;
-#ifdef VM_TRACE
     m_available_data_count+= m_complete_data.m_event_count;
-#endif
 
     bzero(&m_complete_data, sizeof(m_complete_data));
   }

--- 1.27/storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp	2005-05-26 16:22:16 +02:00
+++ 1.28/storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp	2005-05-27 14:01:34 +02:00
@@ -48,9 +48,7 @@
   Uint32 m_gcp_complete_rep_count; // Remaining SUB_GCP_COMPLETE_REP until done
   Uint64 m_gci;                    // GCI
   EventBufData *m_head, *m_tail;
-#ifdef VM_TRACE
   Uint64 m_event_count;
-#endif
 };
 
 class NdbEventOperationImpl : public NdbEventOperation {