bk commit into 5.1 tree (tomas:1.1873)

[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.1873 05/05/24 15:05:01 tomas@stripped +1 -0
  ha_ndbcluster.cc:
    updated ndb binlog timer printouts

  sql/ha_ndbcluster.cc
    1.252 05/05/24 15:04:49 tomas@stripped +13 -7
    updated ndb binlog timer printouts

# 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/wl2325-test

--- 1.251/sql/ha_ndbcluster.cc	2005-05-20 16:20:02 +02:00
+++ 1.252/sql/ha_ndbcluster.cc	2005-05-24 15:04:49 +02:00
@@ -9001,7 +9001,7 @@
   }
 
   (void) pthread_mutex_lock(&share->mutex);
-  assert(share->op == pOp || share->op_old == pOp );
+  DBUG_ASSERT(share->op == pOp || share->op_old == pOp );
   if (share->op_old == pOp)
     share->op_old= 0;
   else
@@ -9276,7 +9276,7 @@
 
 #ifdef RUN_NDB_BINLOG_TIMER
     main_timer.stop();
-    sql_print_information("main_timer %ld msec", main_timer.elapsed_ms());
+    sql_print_information("main_timer %ld ms",  main_timer.elapsed_ms());
     main_timer.start();
 #endif
 
@@ -9318,6 +9318,10 @@
     if(res > 0) // ToDo should perhaps be >= 0 to get empty transactions...
     {
       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";
       error= 0;
       NdbEventOperation *pOp;
@@ -9347,8 +9351,7 @@
 			  table->record[0]);
 	}
 #ifdef RUN_NDB_BINLOG_TIMER
-	Timer write_timer;
-	int event_count= 0;
+	write_timer.start();
 #endif
         do
         {
@@ -9383,9 +9386,6 @@
 
 #ifdef RUN_NDB_BINLOG_TIMER
 	write_timer.stop();
-	sql_print_information("gci %ld event_count %d file %s line %d time %ld msec",
-			      (ulong)gci, event_count,
-			      __FILE__,__LINE__, write_timer.elapsed_ms());
 #endif
 
         if (row.n_inserts || row.n_updates
@@ -9411,6 +9411,12 @@
 	else
 	  trans.commit();
 	ndb_latest_handled_binlog_epoch= gci;
+#ifdef RUN_NDB_BINLOG_TIMER
+	gci_timer.stop();
+	sql_print_information("gci %ld event_count %d write time %ld, total time %ld",
+			      (ulong)gci, event_count, write_timer.elapsed_ms(),
+			      gci_timer.elapsed_ms());
+#endif
       } // while
     } // if
     ndb_latest_handled_binlog_epoch= ndb_latest_received_binlog_epoch;