diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-04-27 12:56:01 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-04-27 12:56:01 +0200 |
| commit | 0e29519b2b4f06f2e37b59c7e9359331c15e83a4 (patch) | |
| tree | 922f8cbd12ff26fed829ed3fbe11e44e2ea2923f /include/my_pthread.h | |
| parent | 49b448ae5a91ed9c0dde57ecd1de724bf517d904 (diff) | |
| parent | 78f89a729a962f7a88869a3d5e50ca493391b2a4 (diff) | |
| download | mariadb-git-0e29519b2b4f06f2e37b59c7e9359331c15e83a4.tar.gz | |
Merge from 4.1 to 5.0
client/mysql.cc:
Auto merged
include/my_pthread.h:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/examples/ha_archive.h:
Auto merged
BUILD/SETUP.sh:
Manual merge of conflicts
-DBIG_TABLES removed set by configure using --with-big-tables
configure.in:
manual merge
mysql-test/r/archive.result:
Manual merge
mysql-test/t/archive.test:
Manual merge
Diffstat (limited to 'include/my_pthread.h')
| -rw-r--r-- | include/my_pthread.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 670a4ccf63e..a84effda2dd 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -604,19 +604,13 @@ 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 -#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 +#else +#define MY_MUTEX_INIT_FAST NULL #endif extern my_bool my_thread_global_init(void); |