diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/event_executor.cc | 11 | ||||
| -rw-r--r-- | sql/event_timed.cc | 4 |
2 files changed, 11 insertions, 4 deletions
diff --git a/sql/event_executor.cc b/sql/event_executor.cc index 4371b006e43..dd426c32545 100644 --- a/sql/event_executor.cc +++ b/sql/event_executor.cc @@ -183,13 +183,20 @@ event_executor_main(void *arg) // needs to call my_thread_init(), otherwise we get a coredump in DBUG_ stuff my_thread_init(); + + if (sizeof(my_time_t) != sizeof(time_t)) + { + sql_print_error("sizeof(my_time_t) != sizeof(time_t) ." + "The scheduler will not work correctly. Stopping."); + goto err_no_thd; + } //TODO Andrey: Check for NULL if (!(thd = new THD)) // note that contructor of THD uses DBUG_ ! { sql_print_error("Cannot create THD for event_executor_main"); goto err_no_thd; - } + } thd->thread_stack = (char*)&thd; // remember where our stack is pthread_detach_this_thread(); @@ -275,7 +282,7 @@ event_executor_main(void *arg) } DBUG_PRINT("evex main thread",("computing time to sleep till next exec")); - time(&now); + time((time_t *)&now); my_tz_UTC->gmt_sec_to_TIME(&time_now, now); t2sleep= evex_time_diff(&et->execute_at, &time_now); VOID(pthread_mutex_unlock(&LOCK_event_arrays)); diff --git a/sql/event_timed.cc b/sql/event_timed.cc index c4a36a81402..cc8849364da 100644 --- a/sql/event_timed.cc +++ b/sql/event_timed.cc @@ -537,7 +537,7 @@ event_timed::compute_next_execution_time() } goto ret; } - time(&now); + time((time_t *)&now); my_tz_UTC->gmt_sec_to_TIME(&time_now, now); /* sql_print_information("[%s.%s]", dbname.str, name.str); @@ -703,7 +703,7 @@ event_timed::mark_last_executed() TIME time_now; my_time_t now; - time(&now); + time((time_t *)&now); my_tz_UTC->gmt_sec_to_TIME(&time_now, now); last_executed= time_now; // was execute_at |