mysql-5.5.34 merge

(some patches reverted, test case added)

1 files changed, 4 insertions, 2 deletions

diff --git a/mysys/my_winthread.c b/mysys/my_winthread.c
index b77581fae78..d7d7817d400 100644
--- a/mysys/my_winthread.c
+++ b/mysys/my_winthread.c
@@ -68,6 +68,7 @@ int pthread_create(pthread_t *thread_id, const pthread_attr_t *attr,
   uintptr_t handle;
   struct thread_start_parameter *par;
   unsigned int  stack_size;
+  int error_no;
   DBUG_ENTER("pthread_create");
 
   par= (struct thread_start_parameter *)malloc(sizeof(*par));
@@ -88,9 +89,10 @@ int pthread_create(pthread_t *thread_id, const pthread_attr_t *attr,
   DBUG_RETURN(0);
 
 error_return:
+  error_no= errno;
   DBUG_PRINT("error",
-         ("Can't create thread to handle request (error %d)",errno));
-  DBUG_RETURN(-1);
+         ("Can't create thread to handle request (error %d)",error_no));
+  DBUG_RETURN(error_no);
 }