#At lp:maria based on revid:monty@askmonty.org-20091125073628-7fekfnr2hmkbjos1 2767 Michael Widenius 2009-11-26 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 modified: client/mysql.cc mysys/thr_mutex.c per-file messages: 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 === modified file 'client/mysql.cc' --- a/client/mysql.cc 2009-11-06 17:22:32 +0000 +++ b/client/mysql.cc 2009-11-25 23:18:23 +0000 @@ -83,7 +83,7 @@ extern "C" { #include <term.h> #endif #endif -#endif +#endif /* defined(HAVE_CURSES_H) && defined(HAVE_TERM_H) */ #undef bcmp // Fix problem with new readline #if defined(__WIN__) @@ -92,7 +92,6 @@ extern "C" { #include <readline/readline.h> #define HAVE_READLINE #endif - //int vidattr(long unsigned int attrs); // Was missing in sun curses } #if !defined(HAVE_VIDATTR) @@ -1024,7 +1023,7 @@ static const char *load_default_groups[] static int embedded_server_arg_count= 0; static char *embedded_server_args[MAX_SERVER_ARGS]; static const char *embedded_server_groups[]= -{ "server", "embedded", "mysql_SERVER", 0 }; +{ "server", "embedded", "mysql_SERVER", "mariadb_SERVER", 0 }; #ifdef HAVE_READLINE /* === modified file 'mysys/thr_mutex.c' --- a/mysys/thr_mutex.c 2009-06-22 08:06:35 +0000 +++ b/mysys/thr_mutex.c 2009-11-25 23:18:23 +0000 @@ -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_ 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 */