mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Added defines for fast mutex in glibc 2.2 (should be safe)
Fixed crash in SELECT DISTINCT SUM(...) Fix return value of mysortncmp() for innobase Fix join_crash bug Docs/manual.texi: Changelog include/my_pthread.h: Added defines for fast mutex in glibc 2.2 mysql-test/t/join_crash.test: Changed table names to t1,t2... mysys/my_bitmap.c: Use fast mutex mysys/my_open.c: Use fast mutex mysys/my_pthread.c: Use fast mutex mysys/my_thr_init.c: Use fast mutex mysys/my_winthread.c: Use fast mutex mysys/thr_mutex.c: Use new mutexattr with error checking sql/ha_innobase.cc: Fix return value of mysortncmp() for innobase sql/sql_select.cc: Fix join_crash bug BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
This commit is contained in:
@ -43,19 +43,8 @@ int safe_mutex_init(safe_mutex_t *mp,
|
||||
const pthread_mutexattr_t *attr __attribute__((unused)))
|
||||
{
|
||||
bzero((char*) mp,sizeof(*mp));
|
||||
#ifdef HAVE_LINUXTHREADS /* Some extra safety */
|
||||
{
|
||||
pthread_mutexattr_t tmp;
|
||||
pthread_mutexattr_init(&tmp);
|
||||
pthread_mutexattr_setkind_np(&tmp,PTHREAD_MUTEX_ERRORCHECK_NP);
|
||||
pthread_mutex_init(&mp->global,&tmp);
|
||||
pthread_mutex_init(&mp->mutex, &tmp);
|
||||
pthread_mutexattr_destroy(&tmp);
|
||||
}
|
||||
#else
|
||||
pthread_mutex_init(&mp->global,NULL);
|
||||
pthread_mutex_init(&mp->global,MY_MUTEX_INIT_ERRCHK);
|
||||
pthread_mutex_init(&mp->mutex,attr);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user