diff options
author | Sergei Golubchik <serg@mariadb.org> | 2015-02-18 15:16:27 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-18 15:16:27 +0100 |
commit | d7e7862364ae344fea5657eb5aae9db3fbb84553 (patch) | |
tree | 38f30e541f98dae9092a09cf030de8f2a336bfd1 /include/mysql.h | |
parent | a06624d61f36c70edd63adcfe2803bb7a8564de5 (diff) | |
parent | fdd6c111c254c5044cd9b6c2f7e4d0c74f427a79 (diff) | |
download | mariadb-git-d7e7862364ae344fea5657eb5aae9db3fbb84553.tar.gz |
Merge branch '5.5' into 10.0
Diffstat (limited to 'include/mysql.h')
-rw-r--r-- | include/mysql.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/mysql.h b/include/mysql.h index 63e86937063..d9d9739dd1f 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -865,6 +865,12 @@ my_socket STDCALL mysql_get_socket(const MYSQL *mysql); unsigned int STDCALL mysql_get_timeout_value(const MYSQL *mysql); unsigned int STDCALL mysql_get_timeout_value_ms(const MYSQL *mysql); +/******************************************************************** + mysql_net_ functions - low-level API to MySQL protocol +*********************************************************************/ +unsigned long STDCALL mysql_net_read_packet(MYSQL *mysql); +unsigned long STDCALL mysql_net_field_length(unsigned char **packet); + /* status return codes */ #define MYSQL_NO_DATA 100 #define MYSQL_DATA_TRUNCATED 101 |