1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed wrong call to my_time(), before my_init() has been called.

Browse Source
This commit is contained in:
jani@a88-113-38-195.elisa-laajakaista.fi 2007-08-07 23:20:21 +03:00
parent 70d937ace4
commit c8dc63b363
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sql/log_event.cc
View File

@ -456,7 +456,11 @@ Log_event::Log_event()
thd(0) thd(0)
{ {
server_id= ::server_id; 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; log_pos= 0;
} }
#endif /* !MYSQL_CLIENT */ #endif /* !MYSQL_CLIENT */
@ -687,6 +691,9 @@ bool Log_event::write_header(IO_CACHE* file, ulong event_data_length)
log_pos= my_b_safe_tell(file)+data_written; 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 Header will be of size LOG_EVENT_HEADER_LEN for all events, except for
FORMAT_DESCRIPTION_EVENT and ROTATE_EVENT, where it will be FORMAT_DESCRIPTION_EVENT and ROTATE_EVENT, where it will be