bk commit into 5.1 tree (tsmith:1.2559) BUG#27638

[tim]

Below is the list of changes that have just been committed into a local
5.1 repository of tsmith. When tsmith 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@stripped, 2007-04-04 11:11:18+02:00, tsmith@stripped +2 -0
  Bug #27638: slow logging to CSV table inserts bad query_time and lock_time values
  
  When MySQL logged slow query information to a CSV table, it stored the
  query_time and lock_time values with an incorrect formula.
  
  If the time was over 59 seconds, this caused incorrect statistics (either the
  slow query was not logged, or the time was far from correct).  This change
  fixes the method used to store those TIME values in the slow_log table.

  sql/log.cc@stripped, 2007-04-04 10:34:59+02:00, tsmith@stripped +9 -2
    Log_to_csv_event_handler::log_slow(): call store_time() instead of store() for query_time and lock_time

  sql/time.cc@stripped, 2007-04-04 10:36:10+02:00, tsmith@stripped +5 -0
    initialize all TIME fields in calc_time_from_sec()

# 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:	tsmith
# Host:	quadxeon.mysql.com
# Root:	/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51

--- 1.274/sql/log.cc	2007-04-02 10:54:27 +02:00
+++ 1.275/sql/log.cc	2007-04-04 10:34:59 +02:00
@@ -569,11 +569,18 @@ bool Log_to_csv_event_handler::
 
   if (query_start_arg)
   {
+    /*
+      XXX: A TIME field can not hold the full longlong range; query_time or
+      lock_time may be truncated without warning here
+    */
+    TIME t;
     /* fill in query_time field */
-    if (table->field[2]->store(query_time, TRUE))
+    calc_time_from_sec(&t, (long) min(query_time, (longlong) TIME_MAX_VALUE), 0);
+    if (table->field[2]->store_time(&t, MYSQL_TIMESTAMP_TIME))
       goto err;
     /* lock_time */
-    if (table->field[3]->store(lock_time, TRUE))
+    calc_time_from_sec(&t, (long) min(lock_time, (longlong) TIME_MAX_VALUE), 0);
+    if (table->field[3]->store_time(&t, MYSQL_TIMESTAMP_TIME))
       goto err;
     /* rows_sent */
     if (table->field[4]->store((longlong) thd->sent_row_count, TRUE))

--- 1.76/sql/time.cc	2006-12-31 01:06:37 +01:00
+++ 1.77/sql/time.cc	2007-04-04 10:36:10 +02:00
@@ -313,6 +313,11 @@ void localtime_to_TIME(TIME *to, struct 
 void calc_time_from_sec(TIME *to, long seconds, long microseconds)
 {
   long t_seconds;
+  to->time_type= MYSQL_TIMESTAMP_TIME;
+  to->neg= 0;
+  to->year= 0;
+  to->month= 0;
+  to->day= 0;
   to->hour= seconds/3600L;
   t_seconds= seconds%3600L;
   to->minute= t_seconds/60L;