bzr commit into mysql-6.0-bugteam branch (joro:2969) Bug#36428 Bug#38364

[Georgi Kodinov]

#At file:///home/kgeorge/mysql/work/B38795-merge-6.0-bugteam/ based on revid:joro@stripped

 2969 Georgi Kodinov	2009-01-16
      Reverted the 6.0 port of fixes for bug#38364 and bug#36428: lot of test
      suite failures.
modified:
  mysys/my_init.c

=== modified file 'mysys/my_init.c'
--- a/mysys/my_init.c	2009-01-13 16:28:29 +0000
+++ b/mysys/my_init.c	2009-01-16 11:49:33 +0000
@@ -84,12 +84,8 @@ my_bool my_init(void)
   if (my_progname)
     my_progname_short= my_progname + dirname_length(my_progname);
 
-#if defined(THREAD)
-  if (my_thread_global_init())
-    return 1;
-#  if defined(SAFE_MUTEX)
+#if defined(THREAD) && defined(SAFE_MUTEX)
   safe_mutex_global_init();		/* Must be called early */
-#  endif
 #endif
 #if defined(THREAD) && defined(MY_PTHREAD_FASTMUTEX) && !defined(SAFE_MUTEX)
   fastmutex_global_init();              /* Must be called early */
@@ -99,6 +95,8 @@ my_bool my_init(void)
 #if defined(HAVE_PTHREAD_INIT)
   pthread_init();			/* Must be called before DBUG_ENTER */
 #endif
+  if (my_thread_global_init())
+    return 1;
 #if !defined( __WIN__) && !defined(__NETWARE__)
   sigfillset(&my_signals);		/* signals blocked by mf_brkhant */
 #endif