Merge with MariaDB 5.5.34.

2 files changed, 4 insertions, 8 deletions

diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c
index 67e074e7e59..f4a0f58511b 100644
--- a/mysys/my_getopt.c
+++ b/mysys/my_getopt.c
@@ -869,12 +869,6 @@ static int findopt(char *optpat, uint length,
       }
     }
   }
-  if (is_prefix && count == 1)
-    my_getopt_error_reporter(WARNING_LEVEL,
-                             "Using unique option prefix %.*s instead of %s "
-                             "is deprecated and will be removed in a future "
-                             "release. Please use the full name instead.",
-                             length, optpat, *ffname);
   DBUG_RETURN(count);
 }
 
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);
 }