diff options
| author | Vladislav Vaintroub <vvaintroub@linux-rbsx> | 2009-12-19 03:21:49 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@linux-rbsx> | 2009-12-19 03:21:49 +0100 |
| commit | 106bb1652ed8918ee580e0aa83d59bf46053f7e9 (patch) | |
| tree | 9ccfada701764a2476975250d029acbe812b12b1 /mysys/my_getsystime.c | |
| parent | 27c0d595e9e3a35232672209219ecc9b74004ab4 (diff) | |
| parent | 4e8d1c6bf30abfd45a993b058ff2a33d4671b73d (diff) | |
| download | mariadb-git-106bb1652ed8918ee580e0aa83d59bf46053f7e9.tar.gz | |
merge
Diffstat (limited to 'mysys/my_getsystime.c')
| -rw-r--r-- | mysys/my_getsystime.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/my_getsystime.c b/mysys/my_getsystime.c index b9f385d83a9..ea12f73fe3d 100644 --- a/mysys/my_getsystime.c +++ b/mysys/my_getsystime.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2004 MySQL AB +/* Copyright (C) 2004 MySQL AB, 2008-2009 Sun Microsystems, Inc This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -171,7 +171,7 @@ ulonglong my_micro_time_and_time(time_t *time_arg) static time_t cur_time= 0; hrtime_t cur_gethrtime; - pthread_mutex_lock(&THR_LOCK_time); + mysql_mutex_lock(&THR_LOCK_time); cur_gethrtime= gethrtime(); if ((cur_gethrtime - prev_gethrtime) > DELTA_FOR_SECONDS) { @@ -179,7 +179,7 @@ ulonglong my_micro_time_and_time(time_t *time_arg) prev_gethrtime= cur_gethrtime; } *time_arg= cur_time; - pthread_mutex_unlock(&THR_LOCK_time); + mysql_mutex_unlock(&THR_LOCK_time); return cur_gethrtime/1000; #else ulonglong newtime; |