bk commit into 5.1 tree (monty:1.2576)

[monty]

Below is the list of changes that have just been committed into a local
5.1 repository of monty. When monty 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-08-03 08:08:33+03:00, monty@stripped +1 -0
  Removed compiler warning

  sql/log.cc@stripped, 2007-08-03 08:08:27+03:00, monty@stripped +4 -2
    Removed compiler warning

diff -Nrup a/sql/log.cc b/sql/log.cc
--- a/sql/log.cc	2007-08-03 01:14:22 +03:00
+++ b/sql/log.cc	2007-08-03 08:08:27 +03:00
@@ -380,7 +380,8 @@ bool Log_to_csv_event_handler::
 
   DBUG_ASSERT(table->field[0]->type() == MYSQL_TYPE_TIMESTAMP);
 
-  ((Field_timestamp*) table->field[0])->store_timestamp(event_time);
+  ((Field_timestamp*) table->field[0])->store_timestamp((my_time_t)
+                                                        event_time);
 
   /* do a write */
   if (table->field[1]->store(user_host, user_host_len, client_cs) ||
@@ -518,7 +519,8 @@ bool Log_to_csv_event_handler::
 
   /* store the time and user values */
   DBUG_ASSERT(table->field[0]->type() == MYSQL_TYPE_TIMESTAMP);
-  ((Field_timestamp*) table->field[0])->store_timestamp(current_time);
+  ((Field_timestamp*) table->field[0])->store_timestamp((my_time_t)
+                                                        current_time);
   if (table->field[1]->store(user_host, user_host_len, client_cs))
     goto err;