Skip to content

Commit c3cda27

Browse files
committed
Expose cli_safe_read and cli_safe_read_nonblocking
Summary: These functions are not publicly exposed. Let's expose them Test Plan: it compiles Reviewers: elip, mung Reviewed By: elip Subscribers: webscalesql-eng@fb.com Differential Revision: https://phabricator.intern.facebook.com/D6607901 Tasks: T24401848, T24117706 Signature: 6607901:1513730795:d4696889b47a0fbf84e46bc870070deebe7d6485
1 parent 13815d1 commit c3cda27

File tree

6 files changed

+15
-2
lines changed

6 files changed

+15
-2
lines changed

include/mysql.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -670,6 +670,10 @@ unsigned int STDCALL mysql_thread_safe(void);
670670
my_bool STDCALL mysql_embedded(void);
671671
my_bool STDCALL mysql_read_query_result(MYSQL *mysql);
672672
int STDCALL mysql_reset_connection(MYSQL *mysql);
673+
ulong STDCALL cli_safe_read(MYSQL *mysql, my_bool *is_data_packet);
674+
net_async_status STDCALL cli_safe_read_nonblocking(MYSQL *mysql, ulong* res,
675+
my_bool *is_data_packet);
676+
673677

674678
/*
675679
The following definitions are added for the enhanced

include/mysql.h.pp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -726,6 +726,9 @@
726726
my_bool mysql_embedded(void);
727727
my_bool mysql_read_query_result(MYSQL *mysql);
728728
int mysql_reset_connection(MYSQL *mysql);
729+
ulong cli_safe_read(MYSQL *mysql, my_bool *is_data_packet);
730+
net_async_status cli_safe_read_nonblocking(MYSQL *mysql, ulong* res,
731+
my_bool *is_data_packet);
729732
enum enum_mysql_stmt_state
730733
{
731734
MYSQL_STMT_INIT_DONE= 1, MYSQL_STMT_PREPARE_DONE, MYSQL_STMT_EXECUTE_DONE,

libmysql/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,8 @@ mysql_load_plugin_v
145145
mysql_options4
146146
mysql_plugin_options
147147
mysql_reset_connection
148+
cli_safe_read
149+
cli_safe_read_nonblocking
148150

149151
CACHE INTERNAL "Functions exported by client API"
150152

libmysql/libmysql.def

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,3 +112,5 @@ EXPORTS
112112
mysql_options4
113113
mysql_plugin_options
114114
mysql_reset_connection
115+
cli_safe_read
116+
cli_safe_read_nonblocking

libmysqld/libmysqld.def

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,3 +106,5 @@ EXPORTS
106106
mysql_stmt_field_count
107107
mysql_stmt_next_result
108108
mysql_reset_connection
109+
cli_safe_read
110+
cli_safe_read_nonblocking

sql-common/client.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,13 +1191,13 @@ ulong cli_safe_read_complete(MYSQL *mysql, ulong len,
11911191
@retval The length of the packet that was read or packet_error in case of
11921192
error. In case of error its description is stored in mysql handle.
11931193
*/
1194-
ulong cli_safe_read(MYSQL *mysql, my_bool *is_data_packet)
1194+
ulong STDCALL cli_safe_read(MYSQL *mysql, my_bool *is_data_packet)
11951195
{
11961196
return cli_safe_read_with_ok(mysql, 0, is_data_packet);
11971197
}
11981198

11991199

1200-
net_async_status
1200+
net_async_status STDCALL
12011201
cli_safe_read_nonblocking(MYSQL *mysql, ulong* res,
12021202
my_bool *is_data_packet)
12031203
{

0 commit comments

Comments
 (0)