From a9c47d8cfc9d93dd93409c3d3681a4f726a456e5 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 8 Aug 2002 03:14:44 +0300 Subject: Fix for Intel compiler (ecc) Minor cleanups to other patches. Make --temp-pool default Docs/manual.texi: Changelog configure.in: Fix for Intel compiler (ecc) include/my_global.h: Cleaned up QNX specific code. include/my_pthread.h: Safety include/my_semaphore.h: Cleaned up BSDI fix. mysys/my_pthread.c: Code comments mysys/my_semaphore.c: Fix for BSDI sql/mysqld.cc: Make --temp-pool default sql/sql_parse.cc: Safety --- mysys/my_pthread.c | 8 +++++++- mysys/my_semaphore.c | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'mysys') diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index 38451f1f79a..cb37fe7c73f 100644 --- a/mysys/my_pthread.c +++ b/mysys/my_pthread.c @@ -438,6 +438,12 @@ int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, #ifdef HPUX +/* + In HP-UX-10.20 and other old Posix 1003.4a Draft 4 implementations + pthread_mutex_trylock returns 1 on success, not 0 like + pthread_mutex_lock +*/ + int my_pthread_mutex_trylock(pthread_mutex_t *mutex) { int error=pthread_mutex_trylock(mutex); @@ -447,9 +453,9 @@ int my_pthread_mutex_trylock(pthread_mutex_t *mutex) error=errno; return error; } - #endif + /* Some help functions */ int pthread_no_free(void *not_used __attribute__((unused))) diff --git a/mysys/my_semaphore.c b/mysys/my_semaphore.c index de4aac1cdbd..2dd224cd99e 100644 --- a/mysys/my_semaphore.c +++ b/mysys/my_semaphore.c @@ -21,6 +21,7 @@ #include #include +#include #if !defined(__WIN__) && !defined(HAVE_SEMAPHORE_H) -- cgit v1.2.1