From 878f1439e3523a2de37f62c902b7adaa79b17f3b Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@mariadb.com>
Date: Thu, 22 Sep 2016 21:48:54 +0000
Subject: [PATCH] Fix misc.warnings.

SSL_LIBRARIES should be set to secur32 with SCHANNEL.
malloc/free declarations were not found in sspi_client, so compiler assumed
malloc() returns an int.
---
 CMakeLists.txt               |  1 +
 plugins/auth/sspi_client.c   |  1 +
 unittest/libmariadb/ssl.c.in | 25 +++++++++++--------------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd12ea84..db2fdee0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -264,6 +264,7 @@ IF(NOT WITH_SSL STREQUAL "OFF")
       ADD_DEFINITIONS(-DHAVE_SCHANNEL -DHAVE_TLS)
       SET(SSL_SOURCES "${CC_SOURCE_DIR}/libmariadb/secure/schannel.c" "${CC_SOURCE_DIR}/libmariadb/secure/ma_schannel.c")
       INCLUDE_DIRECTORIES("${CC_SOURCE_DIR}/plugins/pvio/")
+      SET(SSL_LIBRARIES secur32)
     ENDIF()
   ENDIF()
 
diff --git a/plugins/auth/sspi_client.c b/plugins/auth/sspi_client.c
index 6308b31d..75f5a1f5 100644
--- a/plugins/auth/sspi_client.c
+++ b/plugins/auth/sspi_client.c
@@ -32,6 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <SecExt.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include <mysql/plugin_auth.h>
 #include <mysql.h>
diff --git a/unittest/libmariadb/ssl.c.in b/unittest/libmariadb/ssl.c.in
index 9efb508b..f46f8397 100644
--- a/unittest/libmariadb/ssl.c.in
+++ b/unittest/libmariadb/ssl.c.in
@@ -22,10 +22,6 @@
 
 static int skip_ssl= 1;
 
-#ifdef WIN32
-#define pthread_exit(A) _endthreadex(0)
-#endif
-
 const char *ssluser= "ssluser";
 const char *sslpw= "sslpw";
 char sslhost[128];
@@ -265,9 +261,8 @@ DWORD WINAPI ssl_thread(void *dummy)
   mysql_thread_init();
   
   if (!(mysql= mysql_init(NULL)))
-  {  
-    mysql_thread_end();
-    pthread_exit(NULL);
+  {
+    goto end;
   }
   mysql_ssl_set(mysql, 0, 0, "@CMAKE_SOURCE_DIR@/unittest/libmariadb/certs/ca-cert.pem", 0, 0);
 
@@ -275,18 +270,20 @@ DWORD WINAPI ssl_thread(void *dummy)
           port, socketname, 0))
   {
     diag(">Error: %s", mysql_error(mysql));
-    mysql_close(mysql);
-    mysql_thread_end();
-    pthread_exit(NULL);
+    goto end;
   }
 
   pthread_mutex_lock(&LOCK_test);
   mysql_query(mysql, "UPDATE ssltest SET a=a+1");
   pthread_mutex_unlock(&LOCK_test);
-  mysql_close(mysql);
+
+end:
+  if(mysql)
+    mysql_close(mysql);
   mysql_thread_end();
-  pthread_exit(0);
-  return;
+#ifdef _WIN32
+  return 0;
+#endif
 }
 
 static int test_ssl_threads(MYSQL *mysql)
@@ -775,7 +772,7 @@ static int test_ssl_fp_list(MYSQL *unused __attribute__((unused)))
 static int test_ssl_version(MYSQL *unused __attribute__((unused)))
 {
   unsigned int iversion;
-  const char *version, *library;
+  char *version, *library;
   MYSQL *my;
 
   if (check_skip_ssl())