database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-07 02:42:49 +03:00
Code Activity

Minor fixes:

Browse Source 
fixed compiler warnings in openssl.c and dialog.c
  fixed timeout setting (was wrong in a previous commit)
  disabled session tracking test
This commit is contained in:
Georg Richter
2017-05-09 16:40:09 +02:00
parent 25a97fcd77
commit d2aec415d7
5 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libmariadb/mariadb_lib.c
View File

@@ -1522,8 +1522,8 @@ MYSQL *mthd_my_real_connect(MYSQL *mysql, const char *host, const char *user,
strcpy(mysql->net.sqlstate, "00000"); strcpy(mysql->net.sqlstate, "00000");
/* connection established, apply timeouts */ /* 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_READ_TIMEOUT, mysql->options.read_timeout);
ma_pvio_set_timeout(mysql->net.pvio, PVIO_WRITE_TIMEOUT, mysql->options.write_timeout * 1000); ma_pvio_set_timeout(mysql->net.pvio, PVIO_WRITE_TIMEOUT, mysql->options.write_timeout);
return(mysql); return(mysql);
error: error:

1
libmariadb/secure/openssl.c
View File

@@ -31,6 +31,7 @@
#include <openssl/md4.h> #include <openssl/md4.h>
#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) #if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
#include <openssl/x509v3.h>
#define HAVE_OPENSSL_CHECK_HOST 1 #define HAVE_OPENSSL_CHECK_HOST 1
#endif #endif
#ifdef HAVE_TLS_SESSION_CACHE #ifdef HAVE_TLS_SESSION_CACHE

2
plugins/auth/dialog.c
View File

@@ -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) static int auth_dialog_open(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
{ {
uchar *packet; uchar *packet;
uchar type; uchar type= 0;
char dialog_buffer[1024]; char dialog_buffer[1024];
char *response; char *response;
int packet_length; int packet_length;

2
plugins/pvio/pvio_socket.c
View File

@@ -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; csock= (struct st_pvio_socket *)pvio->data;
pvio->timeout[type]= (timeout > 0) ? timeout * 1000 : -1; pvio->timeout[type]= (timeout > 0) ? timeout * 1000 : -1;
if (csock) if (csock)
return pvio_socket_change_timeout(pvio, type, timeout); return pvio_socket_change_timeout(pvio, type, pvio->timeout[type]);
return 0; return 0;
} }
/* }}} */ /* }}} */

3
unittest/libmariadb/connection.c
View File

@@ -920,6 +920,9 @@ static int test_sess_track_db(MYSQL *mysql)
const char *data; const char *data;
size_t len; size_t len;
diag("session tracking not fully supported yet in 10.2");
return SKIP;
if (!(mysql->server_capabilities & CLIENT_SESSION_TRACKING)) if (!(mysql->server_capabilities & CLIENT_SESSION_TRACKING))
{ {
diag("Server doesn't support session tracking (cap=%lu)", mysql->server_capabilities); diag("Server doesn't support session tracking (cap=%lu)", mysql->server_capabilities);