Merge bug#42850 to 5.1

0b8953ba · Magnus Blåudd · 96665fd9 · c4318b56 · 0b8953ba
Commit 0b8953ba authored Sep 28, 2009 by Magnus Blåudd
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

mysys/my_thr_init.c mysys/my_thr_init.c +4 -3

No files found.
--- a/mysys/my_thr_init.c
+++ b/mysys/my_thr_init.c
@@ -108,10 +108,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 */