diff options
author | unknown <msvensson@pilot.blaudden> | 2007-03-08 14:29:29 +0100 |
---|---|---|
committer | unknown <msvensson@pilot.blaudden> | 2007-03-08 14:29:29 +0100 |
commit | 10ddaa78536cadbebaa20c7afd0d0a95ef1208a1 (patch) | |
tree | ed3ed56ba2a4d52d02f92e0fce49a5c2ae360368 /sql/event_data_objects.cc | |
parent | 90f02ac8616484ca3fe2d78ab95fbb58cae6666a (diff) | |
download | mariadb-git-10ddaa78536cadbebaa20c7afd0d0a95ef1208a1.tar.gz |
Fix 6 warnings from win64, where one is a potential bug.
sql/event_data_objects.cc:
Passing time as time_t to function my_time_t requires
cast to my_time_t since my_time_t are only required to be 32bits.
sql/log.cc:
Using time_t instead of my_time_t when calculating current_time.
This is a potential bugfix for problem with mysql_system_db reporting
slow log as crashed.
sql/sql_show.cc:
Passing time as time_t to function my_time_t requires
cast to my_time_t since my_time_t are only required to be 32bits.
Diffstat (limited to 'sql/event_data_objects.cc')
-rw-r--r-- | sql/event_data_objects.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/event_data_objects.cc b/sql/event_data_objects.cc index dad8aeb2e20..9999424ad60 100644 --- a/sql/event_data_objects.cc +++ b/sql/event_data_objects.cc @@ -535,7 +535,7 @@ Event_parse_data::init_ends(THD *thd) Check whether ENDS is not in the past. */ DBUG_PRINT("info", ("ENDS after NOW?")); - my_tz_UTC->gmt_sec_to_TIME(<ime_now, thd->query_start()); + my_tz_UTC->gmt_sec_to_TIME(<ime_now, (my_time_t)thd->query_start()); if (my_time_compare(<ime_now, <ime) == 1) goto error_bad_params; @@ -1266,7 +1266,7 @@ Event_queue_element::compute_next_execution_time() goto ret; } - my_tz_UTC->gmt_sec_to_TIME(&time_now, current_thd->query_start()); + my_tz_UTC->gmt_sec_to_TIME(&time_now, (my_time_t)current_thd->query_start()); DBUG_PRINT("info",("NOW: [%lu]", (ulong) TIME_to_ulonglong_datetime(&time_now))); |