bk commit into 5.1 tree (jani:1.2559)

[jani]

Below is the list of changes that have just been committed into a local
5.1 repository of jani. When jani 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-07 22:53:06+03:00, jani@stripped +1 -0
  Removed a wrong call to my_time() before my_init() has been called.

  sql/log_event.cc@stripped, 2007-08-07 22:52:59+03:00, jani@stripped +8 -1
    Removed a wrong call to my_time() before my_init() has been called.

diff -Nrup a/sql/log_event.cc b/sql/log_event.cc
--- a/sql/log_event.cc	2007-08-04 12:08:07 +03:00
+++ b/sql/log_event.cc	2007-08-07 22:52:59 +03:00
@@ -456,7 +456,11 @@ Log_event::Log_event()
    thd(0)
 {
   server_id=	::server_id;
-  when=		my_time(0);
+  /*
+    We can't call my_time() here as this would cause a call before
+    my_init() is called
+  */
+  when=		0;
   log_pos=	0;
 }
 #endif /* !MYSQL_CLIENT */
@@ -687,6 +691,9 @@ bool Log_event::write_header(IO_CACHE* f
     log_pos= my_b_safe_tell(file)+data_written;
   }
 
+  /* Set time of we this isn't a query */
+  if (!when)
+    when= current_thd->start_time;
   /*
     Header will be of size LOG_EVENT_HEADER_LEN for all events, except for
     FORMAT_DESCRIPTION_EVENT and ROTATE_EVENT, where it will be