diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-04-27 13:30:00 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-04-27 13:30:00 +0200 |
| commit | 1885e9b858ddcf70cb800cd4790f4ec6b68b485a (patch) | |
| tree | 3d2758d0be3ff6e6e15ed711ea8f9f060a82407c /include | |
| parent | 0e29519b2b4f06f2e37b59c7e9359331c15e83a4 (diff) | |
| parent | ffb4ff245446616f425023256e9fd07204bef000 (diff) | |
| download | mariadb-git-1885e9b858ddcf70cb800cd4790f4ec6b68b485a.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
include/my_pthread.h:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_pthread.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index a84effda2dd..47a38d1a642 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -612,6 +612,12 @@ extern pthread_mutexattr_t my_fast_mutexattr; #else #define MY_MUTEX_INIT_FAST NULL #endif +#ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP +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); extern void my_thread_global_end(void); |