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

6 files changed, 41 insertions, 30 deletions

diff --git a/mysys/my_bitmap.c b/mysys/my_bitmap.c
index a80aafd5605..f30298922df 100644
--- a/mysys/my_bitmap.c
+++ b/mysys/my_bitmap.c
@@ -34,7 +34,7 @@ my_bool bitmap_init(MY_BITMAP *map, uint bitmap_size)
     return 1;
   dbug_assert(bitmap_size != ~(uint) 0);
 #ifdef THREAD
-  pthread_mutex_init(&map->mutex, NULL);
+  pthread_mutex_init(&map->mutex, MY_MUTEX_INIT_FAST);
 #endif
   map->bitmap_size=bitmap_size;
   return 0;
diff --git a/mysys/my_open.c b/mysys/my_open.c
index 1bca4d9cccd..fcf1be575c8 100644
--- a/mysys/my_open.c
+++ b/mysys/my_open.c
@@ -107,7 +107,7 @@ File my_register_filename(File fd, const char *FileName, enum file_type
       my_file_opened++;
       my_file_info[fd].type = type_of_file;
 #if defined(THREAD) && !defined(HAVE_PREAD)
-      pthread_mutex_init(&my_file_info[fd].mutex,NULL);
+      pthread_mutex_init(&my_file_info[fd].mutex,MY_MUTEX_INIT_FAST);
 #endif
       pthread_mutex_unlock(&THR_LOCK_open);
       DBUG_PRINT("exit",("fd: %d",fd));
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c
index b450bba473d..a3a193650df 100644
--- a/mysys/my_pthread.c
+++ b/mysys/my_pthread.c
@@ -316,7 +316,7 @@ int sigwait(sigset_t *setp, int *sigp)
     pthread_t sigwait_thread_id;
     inited=1;
     sigemptyset(&pending_set);
-    pthread_mutex_init(&LOCK_sigwait,NULL);
+    pthread_mutex_init(&LOCK_sigwait,MY_MUTEX_INIT_FAST);
     pthread_cond_init(&COND_sigwait,NULL);
 
     pthread_attr_init(&thr_attr);
diff --git a/mysys/my_thr_init.c b/mysys/my_thr_init.c
index f24c8393ba9..dab281e4dc6 100644
--- a/mysys/my_thr_init.c
+++ b/mysys/my_thr_init.c
@@ -28,13 +28,19 @@
 pthread_key(struct st_my_thread_var*, THR_KEY_mysys);
 #else
 pthread_key(struct st_my_thread_var, THR_KEY_mysys);
-#endif
+#endif /* USE_TLS */
 pthread_mutex_t THR_LOCK_malloc,THR_LOCK_open,THR_LOCK_keycache,
 	        THR_LOCK_lock,THR_LOCK_isam,THR_LOCK_myisam,THR_LOCK_heap,
 	        THR_LOCK_net, THR_LOCK_charset; 
 #ifndef HAVE_LOCALTIME_R
 pthread_mutex_t LOCK_localtime_r;
 #endif
+#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
+pthread_mutexattr_t my_fast_mutexattr;
+#endif
+#ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
+pthread_mutexattr_t my_errchk_mutexattr;
+#endif
 
 /* FIXME  Note.  TlsAlloc does not set an auto destructor, so
 	the function my_thread_global_free must be called from
@@ -47,20 +53,30 @@ my_bool my_thread_global_init(void)
     fprintf(stderr,"Can't initialize threads: error %d\n",errno);
     exit(1);
   }
-  pthread_mutex_init(&THR_LOCK_malloc,NULL);
-  pthread_mutex_init(&THR_LOCK_open,NULL);
-  pthread_mutex_init(&THR_LOCK_keycache,NULL);
-  pthread_mutex_init(&THR_LOCK_lock,NULL);
-  pthread_mutex_init(&THR_LOCK_isam,NULL);
-  pthread_mutex_init(&THR_LOCK_myisam,NULL);
-  pthread_mutex_init(&THR_LOCK_heap,NULL);
-  pthread_mutex_init(&THR_LOCK_net,NULL);
-  pthread_mutex_init(&THR_LOCK_charset,NULL);
+#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
+  pthread_mutexattr_init(&my_fast_mutexattr);
+  pthread_mutexattr_setkind_np(&my_fast_mutexattr,PTHREAD_MUTEX_ADAPTIVE_NP);
+#endif
+#ifdef PPTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
+  pthread_mutexattr_init(&my_errchk_mutexattr);
+  pthread_mutexattr_setkind_np(&my_errchk_mutexattr,
+			       PTHREAD_MUTEX_ERRORCHECK_NP);
+#endif
+
+  pthread_mutex_init(&THR_LOCK_malloc,MY_MUTEX_INIT_FAST);
+  pthread_mutex_init(&THR_LOCK_open,MY_MUTEX_INIT_FAST);
+  pthread_mutex_init(&THR_LOCK_keycache,MY_MUTEX_INIT_FAST);
+  pthread_mutex_init(&THR_LOCK_lock,MY_MUTEX_INIT_FAST);
+  pthread_mutex_init(&THR_LOCK_isam,MY_MUTEX_INIT_SLOW);
+  pthread_mutex_init(&THR_LOCK_myisam,MY_MUTEX_INIT_SLOW);
+  pthread_mutex_init(&THR_LOCK_heap,MY_MUTEX_INIT_FAST);
+  pthread_mutex_init(&THR_LOCK_net,MY_MUTEX_INIT_FAST);
+  pthread_mutex_init(&THR_LOCK_charset,MY_MUTEX_INIT_FAST);
 #ifdef __WIN__
   win_pthread_init();
 #endif
 #ifndef HAVE_LOCALTIME_R
-  pthread_mutex_init(&LOCK_localtime_r,NULL);
+  pthread_mutex_init(&LOCK_localtime_r,MY_MUTEX_INIT_SLOW);
 #endif
   return my_thread_init();
 }
@@ -70,6 +86,12 @@ void my_thread_global_end(void)
 #if defined(USE_TLS)
   (void) TlsFree(THR_KEY_mysys);
 #endif
+#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
+  pthread_mutexattr_destroy(&my_fast_mutexattr);
+#endif
+#ifdef PPTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
+  pthread_mutexattr_destroy(&my_errchk_mutexattr);
+#endif
 }
 
 static long thread_id=0;
@@ -114,7 +136,7 @@ my_bool my_thread_init(void)
   tmp= &THR_KEY_mysys;
 #endif
   tmp->id= ++thread_id;
-  pthread_mutex_init(&tmp->mutex,NULL);
+  pthread_mutex_init(&tmp->mutex,MY_MUTEX_INIT_FAST);
   pthread_cond_init(&tmp->suspend, NULL);
 #if !defined(__WIN__) || defined(USE_TLS) || ! defined(SAFE_MUTEX)
   pthread_mutex_unlock(&THR_LOCK_lock);
@@ -180,14 +202,14 @@ long my_thread_id()
 }
 
 #ifdef DBUG_OFF
-char *my_thread_name(void)
+const char *my_thread_name(void)
 {
   return "no_name";
 }
 
 #else
 
-char *my_thread_name(void)
+const char *my_thread_name(void)
 {
   char name_buff[100];
   struct st_my_thread_var *tmp=my_thread_var;
diff --git a/mysys/my_winthread.c b/mysys/my_winthread.c
index a1fb2c76184..a77167c23e4 100644
--- a/mysys/my_winthread.c
+++ b/mysys/my_winthread.c
@@ -39,7 +39,7 @@ struct pthread_map
 
 void win_pthread_init(void)
 {
-  pthread_mutex_init(&THR_LOCK_thread,NULL);
+  pthread_mutex_init(&THR_LOCK_thread,MY_MUTEX_INIT_FAST);
 }
 
 /*
diff --git a/mysys/thr_mutex.c b/mysys/thr_mutex.c
index 7cc3b30aaf9..fa7ae4f1e82 100644
--- a/mysys/thr_mutex.c
+++ b/mysys/thr_mutex.c
@@ -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;
 }