MDEV-23238 - remove async client from server code.

It is already in libmariadb, and server (also that client in server) does not need it. It does not work in embedded either since it relies on non-blocking sockets
MariaDB · Sep 1, 2020 · 32a29af · 32a29af
1 parent 72f0f0d
commit 32a29af
Show file tree

Hide file tree

Showing 14 changed files with 46 additions and 3,349 deletions.
diff --git 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
@@ -6002,10 +6001,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,

diff --git a/include/my_context.h b/include/my_context.h
diff --git a/include/mysql_async.h b/include/mysql_async.h
diff --git a/include/sql_common.h b/include/sql_common.h
@@ -28,8 +28,6 @@ extern const char	*cant_connect_sqlstate;
 extern const char	*not_error_sqlstate;
 
 
-struct mysql_async_context;
-
 struct st_mysql_options_extention {
   char *plugin_dir;
   char *default_auth;
@@ -41,7 +39,6 @@ struct st_mysql_options_extention {
                           double progress,
                           const char *proc_info,
                           uint proc_info_length);
-  struct mysql_async_context *async_context;
   HASH connection_attributes;
   size_t connection_attributes_length;
 };
@@ -125,10 +122,6 @@ struct st_mysql_client_plugin;
 extern struct st_mysql_client_plugin *mysql_client_builtins[];
 uchar * send_client_connect_attrs(MYSQL *mysql, uchar *buf);
 
-/* Non-blocking client API. */
-void my_context_install_suspend_resume_hook(struct mysql_async_context *b,
-                                            void (*)(my_bool, void *), void *);
-
 #ifdef	__cplusplus
 }
 #endif

diff --git a/include/violite.h b/include/violite.h
@@ -249,7 +249,6 @@ struct st_vio
   char                  *read_pos;      /* start of unfetched data in the
                                            read buffer */
   char                  *read_end;      /* end of unfetched data */
-  struct mysql_async_context *async_context; /* For non-blocking API */
   int                   read_timeout;   /* Timeout value (ms) for read ops. */
   int                   write_timeout;  /* Timeout value (ms) for write ops. */
   /* function pointers. They are similar for socket/SSL/whatever */