[Commits] Rev 3024: MWL#192: Fix problem when we first enable MYSQL_OPT_NONBLOCK, then connect in http://bazaar.launchpad.net/~maria-captains/maria/5.2

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Mon Jan 30 14:45:58 EET 2012


At http://bazaar.launchpad.net/~maria-captains/maria/5.2

------------------------------------------------------------
revno: 3024
revision-id: knielsen at knielsen-hq.org-20120130124558-ub3xwc6q5fqxafiu
parent: knielsen at knielsen-hq.org-20120108091339-suejqxlqz8qfuh3g
committer: knielsen at knielsen-hq.org
branch nick: work-5.2-asynclib2
timestamp: Mon 2012-01-30 13:45:58 +0100
message:
  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.
=== modified file 'sql-common/client.c'
--- a/sql-common/client.c	2012-01-06 11:43:18 +0000
+++ b/sql-common/client.c	2012-01-30 12:45:58 +0000
@@ -2841,8 +2841,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,cons
     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))



More information about the commits mailing list