Access internals

Summary:
The FB MySQL client needs access to some internals that are not otherwise available when using the nonblocking API.  This diff makes the following changes for this purpose:
 - Make the mysql_async.h header file available publicly (needed for access to the NET_ASYNC_DATA() macro)
 - Modify the typedef for the NET_EXTENSION structure.  The existing method works fine in C but fails in C++, so fix this so we can include the file in C++.
 - Make the mysql_get_socket_descriptor() function public.  This is done by moving it to the mysql.h file.  This function was named mysql_get_file_descriptor in 8.0.4.

Differential Revision: D20429899

Author: jkedgar

include/CMakeLists.txt

@@ -34,6 +34,7 @@ SET(HEADERS
   my_compress.h
   my_list.h
   mysql.h
+  mysql_async.h
   mysql_com.h
   mysql_time.h
   ${CMAKE_CURRENT_BINARY_DIR}/mysql_version.h

include/mysql.h

@@ -516,6 +516,7 @@ enum net_async_status STDCALL mysql_next_result_nonblocking(MYSQL *mysql);
 enum net_async_status STDCALL mysql_select_db_nonblocking(MYSQL *mysql,
                                                           const char *db,
                                                           bool *error);
+int STDCALL mysql_get_socket_descriptor(MYSQL *mysql);
 void STDCALL mysql_get_character_set_info(MYSQL *mysql,
                                           MY_CHARSET_INFO *charset);
 

include/mysql.h.pp

@@ -670,6 +670,7 @@
 enum net_async_status mysql_select_db_nonblocking(MYSQL *mysql,
                                                           const char *db,
                                                           bool *error);
+int mysql_get_socket_descriptor(MYSQL *mysql);
 void mysql_get_character_set_info(MYSQL *mysql,
                                           MY_CHARSET_INFO *charset);
 int mysql_session_track_get_first(MYSQL *mysql,

include/mysql_async.h

@@ -172,10 +172,10 @@ typedef struct NET_ASYNC {
   size_t compressed_buffers_size;
 } NET_ASYNC;
 
-struct NET_EXTENSION {
+typedef struct NET_EXTENSION {
   NET_ASYNC *net_async_context;
   mysql_compress_context compress_ctx;
-};
+} NET_EXTENSION;
 
 NET_EXTENSION *net_extension_init();
 void net_extension_free(NET *);
@@ -230,7 +230,7 @@ typedef struct MYSQL_ASYNC {
   struct MYSQL_RES *async_store_result_result;
 
   /** the query parameters data */
-  uchar *async_qp_data;
+  unsigned char *async_qp_data;
   /** the query parameters data length */
   unsigned long async_qp_data_length;
 
@@ -245,6 +245,4 @@ enum net_async_status net_write_command_nonblocking(
     bool *res);
 enum net_async_status my_net_read_nonblocking(NET *net, unsigned long *len_ptr);
 
-int mysql_get_socket_descriptor(MYSQL *mysql);
-
 #endif /* MYSQL_ASYNC_INCLUDED */

libmysql/CMakeLists.txt

@@ -188,6 +188,7 @@ SET(CLIENT_API_NONBLOCKING_FUNCTIONS
   mysql_real_query_nonblocking
   mysql_send_query_nonblocking
   mysql_store_result_nonblocking
+  mysql_get_socket_descriptor
 
   CACHE INTERNAL "Nonblocking functions exported by client API"
 )

sql-common/client.cc

@@ -4963,7 +4963,7 @@ static mysql_state_machine_status csm_send_one_init_command(
 
 #define MAX_CONNECTION_ATTR_STORAGE_LENGTH 65536
 
-int mysql_get_socket_descriptor(MYSQL *mysql) {
+int STDCALL mysql_get_socket_descriptor(MYSQL *mysql) {
   if (mysql && mysql->net.vio) {
     return vio_fd(mysql->net.vio);
   }