diff options
Diffstat (limited to 'client/mysqltest.cc')
| -rw-r--r-- | client/mysqltest.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 417d3615995..f8238cbb26d 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -65,9 +65,8 @@ #define SIGNAL_FMT "signal %d" #endif -#include <my_context.h> static my_bool non_blocking_api_enabled= 0; -#if !defined(EMBEDDED_LIBRARY) && !defined(MY_CONTEXT_DISABLE) +#if !defined(EMBEDDED_LIBRARY) #define WRAP_NONBLOCK_ENABLED non_blocking_api_enabled #include "../tests/nonblock-wrappers.h" #endif @@ -6004,10 +6003,8 @@ void do_connect(struct st_command *command) if (opt_connect_timeout) mysql_options(con_slot->mysql, MYSQL_OPT_CONNECT_TIMEOUT, (void *) &opt_connect_timeout); -#ifndef MY_CONTEXT_DISABLE if (mysql_options(con_slot->mysql, MYSQL_OPT_NONBLOCK, 0)) die("Failed to initialise non-blocking API"); -#endif if (opt_compress || con_compress) mysql_options(con_slot->mysql, MYSQL_OPT_COMPRESS, NullS); mysql_options(con_slot->mysql, MYSQL_SET_CHARSET_NAME, |