From 7c8ebb532eef543a9b98107c164a12a49e28d0ca Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 30 Jan 2012 13:45:58 +0100 Subject: [PATCH] MWL#192: Fix problem when we first enable MYSQL_OPT_NONBLOCK, then connect in normal blocking style, then later do a non-blocking operation. In this case, the vio->async_context was not set up correctly, so that non-blocking operation was not properly handled. --- sql-common/client.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sql-common/client.c b/sql-common/client.c index ad407136b92..b047d177830 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -2841,8 +2841,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, goto error; } - if (mysql->options.extension && mysql->options.extension->async_context && - mysql->options.extension->async_context->active) + if (mysql->options.extension && mysql->options.extension->async_context) net->vio->async_context= mysql->options.extension->async_context; if (my_net_init(net, net->vio))