diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-08-12 04:04:43 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-08-12 04:04:43 +0300 |
| commit | 514e60480d77236aedb1ab69c0e7754e060e495a (patch) | |
| tree | 4ba65b7347df0448111dd1a3ab055bc2c8a1c6dc /mysys/mysys_priv.h | |
| parent | 9b1930152db6ecd30b8cbcc7200af2baf7f82295 (diff) | |
| parent | 071994ba3665ce2284de5e77a4f06c0b6e93eeeb (diff) | |
| download | mariadb-git-514e60480d77236aedb1ab69c0e7754e060e495a.tar.gz | |
merge with 3.23.52
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
Auto merged
Docs/manual.texi:
Auto merged
include/my_no_pthread.h:
Auto merged
innobase/include/univ.i:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/os/os0thread.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
innobase/ut/ut0ut.c:
Auto merged
mysql-test/r/bigint.result:
Auto merged
mysql-test/t/bigint.test:
Auto merged
mysys/my_init.c:
Auto merged
mysys/my_net.c:
Auto merged
mysys/mysys_priv.h:
Auto merged
mysys/thr_rwlock.c:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/sql_insert.cc:
Auto merged
include/my_sys.h:
merge with 3.23
libmysql/Makefile.shared:
merge with 3.23
mysql-test/mysql-test-run.sh:
merge with 3.23
mysql-test/r/func_if.result:
merge with 3.23
mysys/Makefile.am:
merge with 3.23
mysys/my_gethostbyname.c:
merge with 3.23
sql/ha_innodb.cc:
merge with 3.23
sql/item_cmpfunc.cc:
merge with 3.23
sql/mysqld.cc:
merge with 3.23
sql/sql_show.cc:
merge with 3.23
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 |