diff options
Diffstat (limited to 'sql/event_queue.cc')
| -rw-r--r-- | sql/event_queue.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/event_queue.cc b/sql/event_queue.cc index c551cf74095..6016048aa9c 100644 --- a/sql/event_queue.cc +++ b/sql/event_queue.cc @@ -530,9 +530,10 @@ Event_queue::empty_queue() */ void -Event_queue::dbug_dump_queue(time_t now) +Event_queue::dbug_dump_queue(my_time_t when) { #ifndef DBUG_OFF + my_time_t now= when; Event_queue_element *et; uint i; DBUG_ENTER("Event_queue::dbug_dump_queue"); @@ -618,9 +619,9 @@ Event_queue::get_top_for_execution_if_time(THD *thd, time or until signaled. Release LOCK_queue while waiting. */ struct timespec top_time; - set_timespec(top_time, next_activation_at - thd->query_start()); - cond_wait(thd, &top_time, queue_wait_msg, SCHED_FUNC, __LINE__); + set_timespec_time_nsec(top_time, next_activation_at*1000000000ULL); + cond_wait(thd, &top_time, queue_wait_msg, SCHED_FUNC, __LINE__); continue; } |