diff options
| author | unknown <jimw@mysql.com> | 2005-07-22 12:01:42 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-07-22 12:01:42 -0700 |
| commit | 46b0edc444c0dffafbbce8ef5b65f61a0224bef1 (patch) | |
| tree | 9e136b653e4d5e37fbd3c678084c9d8ff047686f /mysys/thr_lock.c | |
| parent | 03fb8276d5f66e9b7ce51a0aa9c0215c71c86a04 (diff) | |
| download | mariadb-git-46b0edc444c0dffafbbce8ef5b65f61a0224bef1.tar.gz | |
Remove use of non-portable gettimeofday() in thr_lock.c (Bug #12100)
mysys/thr_lock.c:
Use set_timespec() macro instead of calling gettimeofday()
Diffstat (limited to 'mysys/thr_lock.c')
| -rw-r--r-- | mysys/thr_lock.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c index b12f8234c26..5b11aa3c6f4 100644 --- a/mysys/thr_lock.c +++ b/mysys/thr_lock.c @@ -388,7 +388,6 @@ wait_for_lock(struct st_lock_list *wait, THR_LOCK_DATA *data, { struct st_my_thread_var *thread_var= my_thread_var; pthread_cond_t *cond= &thread_var->suspend; - struct timeval now; struct timespec wait_timeout; enum enum_thr_lock_result result= THR_LOCK_ABORTED; my_bool can_deadlock= test(data->owner->info->n_cursors); @@ -406,11 +405,7 @@ wait_for_lock(struct st_lock_list *wait, THR_LOCK_DATA *data, data->cond= cond; if (can_deadlock) - { - gettimeofday(&now, 0); - wait_timeout.tv_sec= now.tv_sec + table_lock_wait_timeout; - wait_timeout.tv_nsec= now.tv_usec * 1000; - } + set_timespec(wait_timeout, table_lock_wait_timeout); while (!thread_var->abort || in_wait_list) { int rc= can_deadlock ? pthread_cond_timedwait(cond, &data->lock->mutex, |