From: msvensson
Date: June 7 2007 7:50am
Subject: bk commit into 5.1 tree (msvensson:1.2517)
List-Archive: http://lists.mysql.com/commits/28264
Message-Id: <20070607075057.1C8F030ED7C@pilot>

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-07 09:50:53+02:00, msvensson@pilot.(none) +1 -0
  Merge pilot.(none):/data/msvensson/mysql/bug28690/my50-bug28690
  into  pilot.(none):/data/msvensson/mysql/bug28690/my51-bug28690
  MERGE: 1.1810.2939.29

  mysys/my_thr_init.c@stripped, 2007-06-07 09:50:51+02:00, msvensson@pilot.(none) +0 -5
    Merge 5.0->5.1
    MERGE: 1.31.1.14

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	pilot.(none)
# Root:	/data/msvensson/mysql/bug28690/my51-bug28690/RESYNC

--- 1.55/mysys/my_thr_init.c	2007-04-20 19:52:52 +02:00
+++ 1.56/mysys/my_thr_init.c	2007-06-07 09:50:51 +02:00
@@ -87,20 +87,21 @@ my_bool my_thread_global_init(void)
     fprintf(stderr,"Can't initialize threads: error %d\n", pth_ret);
     return 1;
   }
-  
+
 #ifdef NPTL_PTHREAD_EXIT_BUG
   /*
-    BUG#24507: Race conditions inside current NPTL pthread_exit() 
+    BUG#24507: Race conditions inside current NPTL pthread_exit()
     implementation.
 
     To avoid a possible segmentation fault during concurrent
     executions of pthread_exit(), a dummy thread is spawned which
     initializes internal variables of pthread lib. See bug description
     for a full explanation.
-  
+
     TODO: Remove this code when fixed versions of glibc6 are in common
     use.
   */
+  if (thd_lib_detected == THD_LIB_NPTL)
   {
     pthread_t       dummy_thread;
     pthread_attr_t  dummy_thread_attr;