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

Fix for read/write timeout for sockets on non Windows platforms

Browse Source
This commit is contained in:
Georg Richter
2016-02-23 13:25:03 +01:00
parent d68b48f954
commit 38b78704e0
2 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
unittest/libmariadb/misc.c
View File

@@ -973,6 +973,24 @@ static int test_conc117(MYSQL *mysql)
return OK;
}
static int test_read_timeout(MYSQL *mysql)
{
int timeout= 5, rc;
MYSQL *my= mysql_init(NULL);
mysql_options(my, MYSQL_OPT_READ_TIMEOUT, &timeout);
FAIL_IF(!mysql_real_connect(my, hostname, username, password, schema,
port, socketname, 0), mysql_error(my));
rc= mysql_query(my, "SELECT SLEEP(50)");
FAIL_IF(rc == 0, "error expected");
diag("error: %s", mysql_error(my));
mysql_close(my);
return OK;
}
#ifdef HAVE_REMOTEIO
void *remote_plugin;
static int test_remote1(MYSQL *mysql)
@@ -1113,6 +1131,7 @@ static int test_zerofill(MYSQL *mysql)
}
struct my_tests_st my_tests[] = {
{"test_read_timeout", test_read_timeout, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
{"test_zerofill", test_zerofill, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
#ifdef HAVE_REMOTEIO
{"test_remote1", test_remote1, TEST_CONNECTION_NEW, 0, NULL, NULL},