bzr commit into mysql-5.0-bugteam branch (magnus.blaudd:2816) Bug#42850

[Magnus Blåudd]

#At file:///home/msvensson/mysql/5.0-bugteam/ based on revid:joro@strippedot7i9561e

 2816 Magnus Blåudd	2009-09-28 [merge]
      Merge bug#42850 to 5.0

    modified:
      client/mysqltest.c
      mysys/my_thr_init.c
=== modified file 'client/mysqltest.c'
--- a/client/mysqltest.c	2009-08-28 15:51:31 +0000
+++ b/client/mysqltest.c	2009-09-09 18:52:17 +0000
@@ -1406,7 +1406,7 @@ void show_diff(DYNAMIC_STRING* ds,
   else
     diff_name = 0;
 #else
-  diff_name = "diff";           // Otherwise always assume it's called diff
+  diff_name = "diff";           /* Otherwise always assume it's called diff */
 #endif
 
   if (diff_name)

=== modified file 'mysys/my_thr_init.c'
--- a/mysys/my_thr_init.c	2007-08-16 14:25:48 +0000
+++ b/mysys/my_thr_init.c	2009-09-24 06:30:31 +0000
@@ -107,10 +107,11 @@ my_bool my_thread_global_init(void)
     pthread_attr_t  dummy_thread_attr;
 
     pthread_attr_init(&dummy_thread_attr);
-    pthread_attr_setdetachstate(&dummy_thread_attr, PTHREAD_CREATE_DETACHED);
+    pthread_attr_setdetachstate(&dummy_thread_attr, PTHREAD_CREATE_JOINABLE);
 
-    pthread_create(&dummy_thread,&dummy_thread_attr,
-                   nptl_pthread_exit_hack_handler, NULL);
+    if (pthread_create(&dummy_thread,&dummy_thread_attr,
+                       nptl_pthread_exit_hack_handler, NULL) == 0)
+      (void)pthread_join(dummy_thread, NULL);
   }
 #endif /* TARGET_OS_LINUX */
 

Attachment: [text/bzr-bundle] bzr/[e-mail]