diff options
| author | Michael Widenius <monty@askmonty.org> | 2009-11-26 01:18:23 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2009-11-26 01:18:23 +0200 |
| commit | 069eec35ae76104fd3d3ed0bc931171ba52a6f52 (patch) | |
| tree | 907c3e391aff84609b38cdc5390525a6c5446556 /mysys/thr_mutex.c | |
| parent | 926668feb192d916263fe7baa739290d28987f92 (diff) | |
| download | mariadb-git-069eec35ae76104fd3d3ed0bc931171ba52a6f52.tar.gz | |
Fixed LPBUG#485443 --with-fast-mutexes and without safe mutexes (debug build) maria do not builds
Added 'mariadb_SERVER' as extra config group for MariaDB embedded server
client/mysql.cc:
Cleanup
Added 'mariadb_SERVER' as extra config group for MariaDB embedded server
mysys/thr_mutex.c:
Fixed LPBUG#485443 --with-fast-mutexes and without safe mutexes (debug build) maria do not builds
Diffstat (limited to 'mysys/thr_mutex.c')
| -rw-r--r-- | mysys/thr_mutex.c | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/mysys/thr_mutex.c b/mysys/thr_mutex.c index b5abf987461..5ab1e443a88 100644 --- a/mysys/thr_mutex.c +++ b/mysys/thr_mutex.c @@ -36,6 +36,7 @@ #undef pthread_mutex_init #undef pthread_mutex_lock #undef pthread_mutex_unlock +#undef pthread_mutex_trylock #undef pthread_mutex_destroy #undef pthread_cond_wait #undef pthread_cond_timedwait @@ -838,31 +839,9 @@ static void print_deadlock_warning(safe_mutex_t *new_mutex, DBUG_VOID_RETURN; } +#elif defined(MY_PTHREAD_FASTMUTEX) -#endif /* THREAD && SAFE_MUTEX */ - -#if defined(THREAD) && defined(MY_PTHREAD_FASTMUTEX) && !defined(SAFE_MUTEX) - -#include "mysys_priv.h" -#include "my_static.h" -#include <m_string.h> - -#include <m_ctype.h> -#include <hash.h> -#include <myisampack.h> -#include <mysys_err.h> -#include <my_sys.h> - -#undef pthread_mutex_t -#undef pthread_mutex_init -#undef pthread_mutex_lock -#undef pthread_mutex_trylock -#undef pthread_mutex_unlock -#undef pthread_mutex_destroy -#undef pthread_cond_wait -#undef pthread_cond_timedwait - -ulong mutex_delay(ulong delayloops) +static ulong mutex_delay(ulong delayloops) { ulong i; volatile ulong j; @@ -943,6 +922,6 @@ void fastmutex_global_init(void) cpu_count= sysconf(_SC_NPROCESSORS_CONF); #endif } - -#endif /* SAFE_MUTEX_DEFINED */ + +#endif /* defined(MY_PTHREAD_FASTMUTEX) */ #endif /* THREAD */ |