Skip to content

Commit fdd6c11

Browse files
committed
MDEV-7419 Function cli_safe_read not exported
Start the client API for low-level protocol access: * unsigned long mysql_net_read_packet(MYSQL *mysql); * unsigned long mysql_net_field_length(unsigned char **packet);
1 parent 5dce6aa commit fdd6c11

File tree

4 files changed

+28
-0
lines changed

4 files changed

+28
-0
lines changed

include/mysql.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -854,6 +854,12 @@ my_socket STDCALL mysql_get_socket(const MYSQL *mysql);
854854
unsigned int STDCALL mysql_get_timeout_value(const MYSQL *mysql);
855855
unsigned int STDCALL mysql_get_timeout_value_ms(const MYSQL *mysql);
856856

857+
/********************************************************************
858+
mysql_net_ functions - low-level API to MySQL protocol
859+
*********************************************************************/
860+
unsigned long STDCALL mysql_net_read_packet(MYSQL *mysql);
861+
unsigned long STDCALL mysql_net_field_length(unsigned char **packet);
862+
857863
/* status return codes */
858864
#define MYSQL_NO_DATA 100
859865
#define MYSQL_DATA_TRUNCATED 101

include/mysql.h.pp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -732,3 +732,5 @@
732732
my_socket mysql_get_socket(const MYSQL *mysql);
733733
unsigned int mysql_get_timeout_value(const MYSQL *mysql);
734734
unsigned int mysql_get_timeout_value_ms(const MYSQL *mysql);
735+
unsigned long mysql_net_read_packet(MYSQL *mysql);
736+
unsigned long mysql_net_field_length(unsigned char **packet);

libmysql/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,9 @@ dynamic_column_get
238238
dynamic_column_prepare_decimal
239239
#
240240
mariadb_deinitialize_ssl
241+
# low-level API to MySQL protocol
242+
mysql_net_read_packet
243+
mysql_net_field_length
241244
)
242245

243246
SET(CLIENT_API_FUNCTIONS

libmysql/libmysql.c

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4897,3 +4897,20 @@ my_bool STDCALL mysql_read_query_result(MYSQL *mysql)
48974897
return (*mysql->methods->read_query_result)(mysql);
48984898
}
48994899

4900+
/********************************************************************
4901+
mysql_net_ functions - low-level API to MySQL protocol
4902+
*********************************************************************/
4903+
#if MYSQL_VERSION_ID > 100100
4904+
#error remove these wrappers in 10.1, rename functions instead
4905+
#endif
4906+
4907+
ulong STDCALL mysql_net_read_packet(MYSQL *mysql)
4908+
{
4909+
return cli_safe_read(mysql);
4910+
}
4911+
4912+
ulong STDCALL mysql_net_field_length(uchar **packet)
4913+
{
4914+
return net_field_length(packet);
4915+
}
4916+

0 commit comments

Comments
 (0)