Commit 7c8ebb53 authored by unknown's avatar unknown

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.
parent d5678e17
...@@ -2841,8 +2841,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, ...@@ -2841,8 +2841,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
goto error; goto error;
} }
if (mysql->options.extension && mysql->options.extension->async_context && if (mysql->options.extension && mysql->options.extension->async_context)
mysql->options.extension->async_context->active)
net->vio->async_context= mysql->options.extension->async_context; net->vio->async_context= mysql->options.extension->async_context;
if (my_net_init(net, net->vio)) if (my_net_init(net, net->vio))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment