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

Fix unit test.

Browse Source 
Fix send() prototype
This commit is contained in:
Vladislav Vaintroub
2018-02-14 19:35:16 +00:00
parent 9b3783903a
commit 67cc3438a8
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/pvio/pvio_socket.c
View File

@@ -375,7 +375,7 @@ static ssize_t ma_recv(my_socket socket, uchar *buffer, size_t length, int flags
{ {
ssize_t r; ssize_t r;
do { do {
r = recv(socket, (const char *)buffer, IF_WIN((int)length, length), flags); r = recv(socket, (char*) buffer, IF_WIN((int)length, length), flags);
} }
while (r == -1 && IS_SOCKET_EINTR(socket_errno)); while (r == -1 && IS_SOCKET_EINTR(socket_errno));
return r; return r;

7
unittest/libmariadb/connection.c
View File

@@ -981,8 +981,13 @@ static int test_sess_track_db(MYSQL *mysql)
return OK; return OK;
} }
static int test_unix_socket_close(MYSQL *unused __attribute__((unused))) static int test_unix_socket_close(MYSQL *unused __attribute__((unused)))
{ {
#ifdef _WIN32
diag("test does not run on Windows");
return SKIP;
#else
MYSQL *mysql= mysql_init(NULL); MYSQL *mysql= mysql_init(NULL);
FILE *fp; FILE *fp;
int i; int i;
@@ -1007,8 +1012,10 @@ static int test_unix_socket_close(MYSQL *unused __attribute__((unused)))
} }
mysql_close(mysql); mysql_close(mysql);
return OK; return OK;
#endif
} }
static int test_reset(MYSQL *mysql) static int test_reset(MYSQL *mysql)
{ {
int rc; int rc;