diff options
| author | unknown <geert@kriem.kemuri.org> | 2005-04-29 14:46:53 +0200 |
|---|---|---|
| committer | unknown <geert@kriem.kemuri.org> | 2005-04-29 14:46:53 +0200 |
| commit | a34cb7932d914db76dd21fd28988cff7fa6279c9 (patch) | |
| tree | 17e0d7dc5d8359528d97e5a697fdbe661e1ecf58 /include | |
| parent | 8bb6c4d4d5ca047c63a6453114a60d305ed8cc5b (diff) | |
| parent | 17e6c8f292d0273ef26d0c3deeaa259e5d0d8db9 (diff) | |
| download | mariadb-git-a34cb7932d914db76dd21fd28988cff7fa6279c9.tar.gz | |
Merge gvanderkelen@bk-internal.mysql.com:/home/bk/mysql-5.0
into kriem.kemuri.org:/home/geert/MySQL/mysql-5.0
client/mysql.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_pthread.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 670a4ccf63e..47a38d1a642 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -604,19 +604,19 @@ extern int my_rw_trywrlock(my_rw_lock_t *); #define pthread_attr_setstacksize(A,B) pthread_dummy(0) #endif -/* Define mutex types */ +/* Define mutex types, see my_thr_init.c */ #define MY_MUTEX_INIT_SLOW NULL -#define MY_MUTEX_INIT_FAST NULL -#define MY_MUTEX_INIT_ERRCHK NULL #ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP extern pthread_mutexattr_t my_fast_mutexattr; -#undef MY_MUTEX_INIT_FAST #define MY_MUTEX_INIT_FAST &my_fast_mutexattr +#else +#define MY_MUTEX_INIT_FAST NULL #endif #ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP -extern pthread_mutexattr_t my_errchk_mutexattr; -#undef MY_INIT_MUTEX_ERRCHK -#define MY_INIT_MUTEX_ERRCHK &my_errchk_mutexattr +extern pthread_mutexattr_t my_errorcheck_mutexattr; +#define MY_MUTEX_INIT_ERRCHK &my_errorcheck_mutexattr +#else +#define MY_MUTEX_INIT_ERRCHK NULL #endif extern my_bool my_thread_global_init(void); |