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 asynchronous connect:

Browse Source 
Unless the connection was successfully established mysql_get_socket will
return INVALID_SOCKET. In this case we need to check if an asynchronous
operation is in progress and return pvio from asynchronous context.
This commit is contained in:
Georg Richter
2015-11-15 08:00:43 +01:00
parent 1af54355b4
commit 9b1cbf15a5
5 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
unittest/libmariadb/async.c
View File

@@ -118,7 +118,7 @@ wait_for_mysql(MYSQL *mysql, int status)
static int async1(MYSQL *my)
{
int err;
int err, rc;
MYSQL mysql, *ret;
MYSQL_RES *res;
MYSQL_ROW row;
@@ -130,7 +130,8 @@ static int async1(MYSQL *my)
{
mysql_init(&mysql);
mysql_options(&mysql, MYSQL_OPT_NONBLOCK, 0);
rc= mysql_options(&mysql, MYSQL_OPT_NONBLOCK, 0);
check_mysql_rc(rc, (MYSQL *)&mysql);
/* set timeouts to 300 microseconds */
default_timeout= 300;
@@ -193,9 +194,11 @@ static int async1(MYSQL *my)
static int test_conc131(MYSQL *my)
{
int rc;
/* this test needs to run under valgrind */
MYSQL *mysql=mysql_init(NULL);
mysql_options(mysql, MYSQL_OPT_NONBLOCK, 0);
rc= mysql_options(mysql, MYSQL_OPT_NONBLOCK, 0);
check_mysql_rc(rc, mysql);
mysql_close(mysql);
return OK;
}