Safety fix to detect multiple calls to my_thread_end()

Portability fix (For Mac OS X)

configure.in

@@ -733,7 +733,7 @@ AC_CHECK_HEADERS(fcntl.h float.h floatingpoint.h ieeefp.h limits.h \
  strings.h string.h synch.h sys/mman.h sys/socket.h netinet/in.h arpa/inet.h \
  sys/timeb.h sys/types.h sys/un.h sys/vadvise.h sys/wait.h term.h \
  unistd.h utime.h sys/utime.h termio.h termios.h sched.h crypt.h alloca.h \
- sys/ioctl.h)
+ sys/ioctl.h malloc.h sys/malloc.h)
 
 #--------------------------------------------------------------------
 # Check for system libraries. Adds the library to $LIBS

include/my_pthread.h

@@ -637,6 +637,7 @@ struct st_my_thread_var
   long id;
   int cmp_length;
   int volatile abort;
+  my_bool init;
 #ifndef DBUG_OFF
   gptr dbug;
   char name[THREAD_NAME_SIZE+1];

libmysqld/lib_sql.cc

@@ -621,11 +621,6 @@ void STDCALL mysql_server_end()
   my_free((char*) copy_arguments_ptr, MYF(MY_ALLOW_ZERO_PTR));
   copy_arguments_ptr=0;
   clean_up(0);
-#ifdef THREAD
-  /* Don't call my_thread_end() if the application is using MY_INIT() */
-  if (!org_my_init_done)
-    my_thread_end();
-#endif
   /* If library called my_init(), free memory allocated by it */
   if (!org_my_init_done)
     my_end(0);

mysys/charset.c

@@ -453,20 +453,37 @@ static my_bool charset_in_string(const char *name, DYNAMIC_STRING *s)
 
 static void charset_append(DYNAMIC_STRING *s, const char *name)
 {
-  if (!charset_in_string(name, s)) {
+  if (!charset_in_string(name, s))
+  {
     dynstr_append(s, name);
     dynstr_append(s, " ");
   }
 }
 
 
-/* Returns a dynamically-allocated string listing the character sets
+/*
-   requested.  The caller is responsible for freeing the memory. */
+  Returns a dynamically-allocated string listing the character sets
+  requested.
+
+  SYNOPSIS
+    list_charsets()
+    want_flags		Flags for which character sets to return:
+			MY_COMPILED_SETS:	Return incompiled charsets    
+			MY_INDEX_SETS:
+			MY_LOADED_SETS:
+
+  NOTES
+    The caller is responsible for freeing the memory.
+
+
+  RETURN
+    A string with available character sets separated by space
+*/
 
 char * list_charsets(myf want_flags)
 {
   DYNAMIC_STRING s;
-  char *p;
+  char *result;
 
   (void)init_available_charsets(MYF(0));
   init_dynamic_string(&s, NullS, 256, 1024);
@@ -483,28 +500,30 @@ char * list_charsets(myf want_flags)
 
   if (want_flags & MY_CONFIG_SETS)
   {
-    CS_ID **c;
+    CS_ID **charset;
     char buf[FN_REFLEN];
     MY_STAT status;
 
-    if((c=available_charsets))
+    if ((charset=available_charsets))
-      for (; *c; ++c)
     {
-	  if (charset_in_string((*c)->name, &s))
+      for (; *charset; charset++)
+      {
+	if (charset_in_string((*charset)->name, &s))
 	  continue;
-	  get_charset_conf_name((*c)->number, buf);
+	get_charset_conf_name((*charset)->number, buf);
 	if (!my_stat(buf, &status, MYF(0)))
 	  continue;       /* conf file doesn't exist */
-	  dynstr_append(&s, (*c)->name);
+	dynstr_append(&s, (*charset)->name);
 	dynstr_append(&s, " ");
       }
     }
+  }
 
   if (want_flags & MY_INDEX_SETS)
   {
-    CS_ID **c;
+    CS_ID **charset;
-    for (c = available_charsets; *c; ++c)
+    for (charset = available_charsets; *charset; charset++)
-      charset_append(&s, (*c)->name);
+      charset_append(&s, (*charset)->name);
   }
 
   if (want_flags & MY_LOADED_SETS)
@@ -514,11 +533,12 @@ char * list_charsets(myf want_flags)
       charset_append(&s,
 		     dynamic_element(&cs_info_table, i, CHARSET_INFO *)->name);
   }
-  s.str[s.length - 1] = '\0';   /* chop trailing space */
+  if (s.length)
-  p = my_strdup(s.str, MYF(MY_WME));
+    s.length--;					/* Remove end space */
+  result= my_strdup_with_length(s.str, s.length, MYF(MY_WME));
   dynstr_free(&s);
 
-  return p;
+  return result;
 }
 
 /****************************************************************************

mysys/my_thr_init.c

@@ -159,6 +159,7 @@ my_bool my_thread_init(void)
   tmp->id= ++thread_id;
   pthread_mutex_init(&tmp->mutex,MY_MUTEX_INIT_FAST);
   pthread_cond_init(&tmp->suspend, NULL);
+  tmp->init= 1;
 
 end:
 #if !defined(__WIN__) || defined(USE_TLS) || ! defined(SAFE_MUTEX)
@@ -170,12 +171,14 @@ end:
 
 void my_thread_end(void)
 {
-  struct st_my_thread_var *tmp=my_thread_var;
+  struct st_my_thread_var *tmp;
+  tmp= my_pthread_getspecific(struct st_my_thread_var*,THR_KEY_mysys);
+
 #ifdef EXTRA_DEBUG_THREADS
   fprintf(stderr,"my_thread_end(): tmp=%p,thread_id=%ld\n",
 	  tmp,pthread_self());
 #endif  
-  if (tmp)
+  if (tmp && tmp->init)
   {
 #if !defined(DBUG_OFF)
     /* tmp->dbug is allocated inside DBUG library */
@@ -191,6 +194,8 @@ void my_thread_end(void)
     pthread_mutex_destroy(&tmp->mutex);
 #if (!defined(__WIN__) && !defined(OS2)) || defined(USE_TLS)
     free(tmp);
+#else
+    tmp->init= 0;
 #endif
   }
   /* The following free has to be done, even if my_thread_var() is 0 */

sql/sql_test.cc

@@ -22,7 +22,11 @@
 #include "sql_select.h"
 #include <hash.h>
 #include <thr_alarm.h>
+#if defined(HAVE_MALLINFO) && defined(HAVE_MALLOC_H)
 #include <malloc.h>
+#elif defined(HAVE_MALLINFO) && defined(HAVE_SYS_MALLOC_H)
+#include <sys/malloc.h>
+#endif
 
 /* Intern key cache variables */
 extern "C" pthread_mutex_t THR_LOCK_keycache;