diff options
author | dlenev@dlenev.mshome <> | 2003-08-11 23:43:01 +0400 |
---|---|---|
committer | dlenev@dlenev.mshome <> | 2003-08-11 23:43:01 +0400 |
commit | 921ac8af8b388a90b6c06db2de78dba1cd5a3950 (patch) | |
tree | bec2ab17e0424dac363d21f954738ff68f4fede9 /mysys/my_thr_init.c | |
parent | a60acfcfe09945c9dd7d326ab99d1df5715cba46 (diff) | |
download | mariadb-git-921ac8af8b388a90b6c06db2de78dba1cd5a3950.tar.gz |
Implemented UTC_TIME, UTC_DATE and UTC_TIMESTAMP functions (WL#345)
Diffstat (limited to 'mysys/my_thr_init.c')
-rw-r--r-- | mysys/my_thr_init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/my_thr_init.c b/mysys/my_thr_init.c index 59466083b28..32bc8ea3724 100644 --- a/mysys/my_thr_init.c +++ b/mysys/my_thr_init.c @@ -31,7 +31,7 @@ pthread_key(struct st_my_thread_var, THR_KEY_mysys); pthread_mutex_t THR_LOCK_malloc,THR_LOCK_open,THR_LOCK_keycache, THR_LOCK_lock,THR_LOCK_isam,THR_LOCK_myisam,THR_LOCK_heap, THR_LOCK_net, THR_LOCK_charset; -#ifndef HAVE_LOCALTIME_R +#if !defined(HAVE_LOCALTIME_R) || !defined(HAVE_GMTIME_R) pthread_mutex_t LOCK_localtime_r; #endif #ifndef HAVE_GETHOSTBYNAME_R @@ -73,7 +73,7 @@ my_bool my_thread_global_init(void) #if defined( __WIN__) || defined(OS2) win_pthread_init(); #endif -#ifndef HAVE_LOCALTIME_R +#if !defined(HAVE_LOCALTIME_R) || !defined(HAVE_GMTIME_R) pthread_mutex_init(&LOCK_localtime_r,MY_MUTEX_INIT_SLOW); #endif #ifndef HAVE_GETHOSTBYNAME_R @@ -103,7 +103,7 @@ void my_thread_global_end(void) pthread_mutex_destroy(&THR_LOCK_heap); pthread_mutex_destroy(&THR_LOCK_net); pthread_mutex_destroy(&THR_LOCK_charset); -#ifndef HAVE_LOCALTIME_R +#if !defined(HAVE_LOCALTIME_R) || !defined(HAVE_GMTIME_R) pthread_mutex_destroy(&LOCK_localtime_r); #endif #ifndef HAVE_GETHOSTBYNAME_R |