Expose cli_safe_read and cli_safe_read_nonblocking

Summary: These functions are not publicly exposed. Let's expose them Differential Revision: D6607901 fbshipit-source-id: c3cda27
asu-idi · Dec 21, 2017 · 57db93f · 57db93f
1 parent e9cb575
commit 57db93f
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 2 deletions.
diff --git a/include/mysql.h b/include/mysql.h
@@ -670,6 +670,10 @@ unsigned int	STDCALL mysql_thread_safe(void);
 my_bool		STDCALL mysql_embedded(void);
 my_bool         STDCALL mysql_read_query_result(MYSQL *mysql);
 int             STDCALL mysql_reset_connection(MYSQL *mysql);
+ulong STDCALL cli_safe_read(MYSQL *mysql, my_bool *is_data_packet);
+net_async_status STDCALL cli_safe_read_nonblocking(MYSQL *mysql, ulong* res,
+                                                   my_bool *is_data_packet);
+
 
 /*
   The following definitions are added for the enhanced 

diff --git a/include/mysql.h.pp b/include/mysql.h.pp
@@ -726,6 +726,9 @@
 my_bool mysql_embedded(void);
 my_bool mysql_read_query_result(MYSQL *mysql);
 int mysql_reset_connection(MYSQL *mysql);
+ulong cli_safe_read(MYSQL *mysql, my_bool *is_data_packet);
+net_async_status cli_safe_read_nonblocking(MYSQL *mysql, ulong* res,
+                                                   my_bool *is_data_packet);
 enum enum_mysql_stmt_state
 {
   MYSQL_STMT_INIT_DONE= 1, MYSQL_STMT_PREPARE_DONE, MYSQL_STMT_EXECUTE_DONE,

diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
@@ -145,6 +145,8 @@ mysql_load_plugin_v
 mysql_options4
 mysql_plugin_options
 mysql_reset_connection
+cli_safe_read
+cli_safe_read_nonblocking
 
 CACHE INTERNAL "Functions exported by client API"
 

diff --git a/libmysql/libmysql.def b/libmysql/libmysql.def
@@ -112,3 +112,5 @@ EXPORTS
 	mysql_options4
 	mysql_plugin_options
   mysql_reset_connection
+  cli_safe_read
+  cli_safe_read_nonblocking
diff --git a/libmysqld/libmysqld.def b/libmysqld/libmysqld.def
@@ -106,3 +106,5 @@ EXPORTS
 	mysql_stmt_field_count
 	mysql_stmt_next_result
   mysql_reset_connection
+  cli_safe_read
+  cli_safe_read_nonblocking
diff --git a/sql-common/client.c b/sql-common/client.c
@@ -1191,13 +1191,13 @@ ulong cli_safe_read_complete(MYSQL *mysql, ulong len,
   @retval The length of the packet that was read or packet_error in case of
           error. In case of error its description is stored in mysql handle.
 */
-ulong cli_safe_read(MYSQL *mysql, my_bool *is_data_packet)
+ulong STDCALL cli_safe_read(MYSQL *mysql, my_bool *is_data_packet)
 {
   return cli_safe_read_with_ok(mysql, 0, is_data_packet);
 }
 
 
-net_async_status
+net_async_status STDCALL
 cli_safe_read_nonblocking(MYSQL *mysql, ulong* res,
                           my_bool *is_data_packet)
 {