From d2aec415d766f04626bfcc3a5bec7c83f01ab803 Mon Sep 17 00:00:00 2001
From: Georg Richter <georg@mariadb.com>
Date: Tue, 9 May 2017 16:40:09 +0200
Subject: [PATCH] Minor fixes:   fixed compiler warnings in openssl.c and
 dialog.c   fixed timeout setting (was wrong in a previous commit)   disabled
 session tracking test

---
 libmariadb/mariadb_lib.c         | 4 ++--
 libmariadb/secure/openssl.c      | 1 +
 plugins/auth/dialog.c            | 2 +-
 plugins/pvio/pvio_socket.c       | 2 +-
 unittest/libmariadb/connection.c | 3 +++
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c
index 06b1cfe0..7590001d 100644
--- a/libmariadb/mariadb_lib.c
+++ b/libmariadb/mariadb_lib.c
@@ -1522,8 +1522,8 @@ MYSQL *mthd_my_real_connect(MYSQL *mysql, const char *host, const char *user,
   strcpy(mysql->net.sqlstate, "00000");
 
   /* connection established, apply timeouts */
-  ma_pvio_set_timeout(mysql->net.pvio, PVIO_READ_TIMEOUT, mysql->options.read_timeout * 1000);
-  ma_pvio_set_timeout(mysql->net.pvio, PVIO_WRITE_TIMEOUT, mysql->options.write_timeout * 1000);
+  ma_pvio_set_timeout(mysql->net.pvio, PVIO_READ_TIMEOUT, mysql->options.read_timeout);
+  ma_pvio_set_timeout(mysql->net.pvio, PVIO_WRITE_TIMEOUT, mysql->options.write_timeout);
   return(mysql);
 
 error:
diff --git a/libmariadb/secure/openssl.c b/libmariadb/secure/openssl.c
index 72678491..00e19ea0 100644
--- a/libmariadb/secure/openssl.c
+++ b/libmariadb/secure/openssl.c
@@ -31,6 +31,7 @@
 #include <openssl/md4.h>
 
 #if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+#include <openssl/x509v3.h>
 #define HAVE_OPENSSL_CHECK_HOST 1
 #endif
 #ifdef HAVE_TLS_SESSION_CACHE
diff --git a/plugins/auth/dialog.c b/plugins/auth/dialog.c
index 1064b871..c78898ae 100644
--- a/plugins/auth/dialog.c
+++ b/plugins/auth/dialog.c
@@ -131,7 +131,7 @@ static char *auth_dialog_native_prompt(MYSQL *mysql __attribute__((unused)),
 static int auth_dialog_open(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
 {
   uchar *packet;
-  uchar type;
+  uchar type= 0;
   char dialog_buffer[1024];
   char *response;
   int packet_length;
diff --git a/plugins/pvio/pvio_socket.c b/plugins/pvio/pvio_socket.c
index bf9be0e8..95cb9fec 100644
--- a/plugins/pvio/pvio_socket.c
+++ b/plugins/pvio/pvio_socket.c
@@ -227,7 +227,7 @@ my_bool pvio_socket_set_timeout(MARIADB_PVIO *pvio, enum enum_pvio_timeout type,
   csock= (struct st_pvio_socket *)pvio->data;
   pvio->timeout[type]= (timeout > 0) ? timeout * 1000 : -1;
   if (csock)
-    return pvio_socket_change_timeout(pvio, type, timeout);
+    return pvio_socket_change_timeout(pvio, type, pvio->timeout[type]);
   return 0;
 }
 /* }}} */
diff --git a/unittest/libmariadb/connection.c b/unittest/libmariadb/connection.c
index 29b2a931..26c4ddb0 100644
--- a/unittest/libmariadb/connection.c
+++ b/unittest/libmariadb/connection.c
@@ -920,6 +920,9 @@ static int test_sess_track_db(MYSQL *mysql)
   const char *data;
   size_t len;
 
+  diag("session tracking not fully supported yet in 10.2");
+  return SKIP;
+
   if (!(mysql->server_capabilities & CLIENT_SESSION_TRACKING))
   {
     diag("Server doesn't support session tracking (cap=%lu)", mysql->server_capabilities);