bk commit into 5.1 tree (tomas:1.2353)

[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.2353 06/04/21 18:28:00 tomas@stripped +1 -0
  ndb: minor modification in replication timer code
  added missing setting of latest applied epoch

  sql/ha_ndbcluster_binlog.cc
    1.47 06/04/21 18:27:53 tomas@stripped +9 -7
    ndb: minor modification in replication timer code
    added missing setting of latest applied epoch

# 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-new

--- 1.46/sql/ha_ndbcluster_binlog.cc	2006-04-20 14:44:10 +02:00
+++ 1.47/sql/ha_ndbcluster_binlog.cc	2006-04-21 18:27:53 +02:00
@@ -3095,6 +3095,9 @@
   Thd_ndb *thd_ndb=0;
   int ndb_update_binlog_index= 1;
   injector *inj= injector::instance();
+#ifdef RUN_NDB_BINLOG_TIMER
+  Timer main_timer;
+#endif
 
   pthread_mutex_lock(&injector_mutex);
   /*
@@ -3233,9 +3236,6 @@
     thd->db= db;
   }
 
-#ifdef RUN_NDB_BINLOG_TIMER
-  Timer main_timer;
-#endif
   for ( ; !((abort_loop || do_ndbcluster_binlog_close_connection) &&
             ndb_latest_handled_binlog_epoch >= g_latest_trans_gci); )
   {
@@ -3316,15 +3316,16 @@
     if (res > 0)
     {
       DBUG_PRINT("info", ("pollEvents res: %d", res));
-#ifdef RUN_NDB_BINLOG_TIMER
-      Timer gci_timer, write_timer;
-      int event_count= 0;
-#endif
       thd->proc_info= "Processing events";
       NdbEventOperation *pOp= i_ndb->nextEvent();
       Binlog_index_row row;
       while (pOp != NULL)
       {
+#ifdef RUN_NDB_BINLOG_TIMER
+        Timer gci_timer, write_timer;
+        int event_count= 0;
+        gci_timer.start();
+#endif
         gci= pOp->getGCI();
         DBUG_PRINT("info", ("Handling gci: %d", (unsigned)gci));
         // sometimes get TE_ALTER with invalid table
@@ -3503,6 +3504,7 @@
           DBUG_PRINT("info", ("COMMIT gci: %lld", gci));
           if (ndb_update_binlog_index)
             ndb_add_binlog_index(thd, &row);
+          ndb_latest_applied_binlog_epoch= gci;
         }
         ndb_latest_handled_binlog_epoch= gci;
 #ifdef RUN_NDB_BINLOG_TIMER