diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-01-30 13:45:58 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-01-30 13:45:58 +0100 |
| commit | 7c8ebb532eef543a9b98107c164a12a49e28d0ca (patch) | |
| tree | d4f5e863949947c0737d07749528d5479251fda6 /sql-common | |
| parent | d5678e1778d684610b50ab8f2b8f11289d075c02 (diff) | |
| download | mariadb-git-7c8ebb532eef543a9b98107c164a12a49e28d0ca.tar.gz | |
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.
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 3 |
1 files changed, 1 insertions, 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)) |