diff options
author | monty@hundin.mysql.fi <> | 2002-08-12 04:04:43 +0300 |
---|---|---|
committer | monty@hundin.mysql.fi <> | 2002-08-12 04:04:43 +0300 |
commit | 3ef9d44edcd3db115d03a6ed7e896c662ad2182e (patch) | |
tree | 4ba65b7347df0448111dd1a3ab055bc2c8a1c6dc /mysys/mysys_priv.h | |
parent | c99c1fd38439a7c529dc24c03c5ff586ba694c57 (diff) | |
parent | d825808a726960fa4fde7d4569c2d95014ca440f (diff) | |
download | mariadb-git-3ef9d44edcd3db115d03a6ed7e896c662ad2182e.tar.gz |
merge with 3.23.52
Diffstat (limited to 'mysys/mysys_priv.h')
-rw-r--r-- | mysys/mysys_priv.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/mysys_priv.h b/mysys/mysys_priv.h index ba16e8820fe..75d77ed9987 100644 --- a/mysys/mysys_priv.h +++ b/mysys/mysys_priv.h @@ -22,10 +22,10 @@ #endif #ifdef THREAD +#include <my_pthread.h> extern pthread_mutex_t THR_LOCK_malloc,THR_LOCK_open,THR_LOCK_keycache, THR_LOCK_lock,THR_LOCK_isam,THR_LOCK_net,THR_LOCK_charset; extern pthread_mutex_t LOCK_bitmap; -#else /* THREAD */ -#define pthread_mutex_lock(A) -#define pthread_mutex_unlock(A) +#else +#include <my_no_pthread.h> #endif |