Merge 10.1 into 10.2

1 files changed, 1 insertions, 1 deletions

diff --git a/include/my_pthread.h b/include/my_pthread.h
index 672bca5ab39..0504a5f3272 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -163,7 +163,7 @@ int pthread_cancel(pthread_t thread);
 #define pthread_key(T,V) pthread_key_t V
 #define my_pthread_getspecific_ptr(T,V) my_pthread_getspecific(T,(V))
 #define my_pthread_setspecific_ptr(T,V) pthread_setspecific(T,(void*) (V))
-#define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(tmp); }
+#define pthread_detach_this_thread()
 #define pthread_handler_t EXTERNC void *
 typedef void *(* pthread_handler)(void *);