summaryrefslogtreecommitdiff
path: root/include/mysql.h.pp
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-02-18 15:16:27 +0100
committerSergei Golubchik <serg@mariadb.org>2015-02-18 15:16:27 +0100
commitd7e7862364ae344fea5657eb5aae9db3fbb84553 (patch)
tree38f30e541f98dae9092a09cf030de8f2a336bfd1 /include/mysql.h.pp
parenta06624d61f36c70edd63adcfe2803bb7a8564de5 (diff)
parentfdd6c111c254c5044cd9b6c2f7e4d0c74f427a79 (diff)
downloadmariadb-git-d7e7862364ae344fea5657eb5aae9db3fbb84553.tar.gz
Merge branch '5.5' into 10.0
Diffstat (limited to 'include/mysql.h.pp')
-rw-r--r--include/mysql.h.pp2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/mysql.h.pp b/include/mysql.h.pp
index dd794e856e1..f2c040b694c 100644
--- a/include/mysql.h.pp
+++ b/include/mysql.h.pp
@@ -747,3 +747,5 @@ int mysql_close_cont(MYSQL *sock, int status);
my_socket mysql_get_socket(const MYSQL *mysql);
unsigned int mysql_get_timeout_value(const MYSQL *mysql);
unsigned int mysql_get_timeout_value_ms(const MYSQL *mysql);
+unsigned long mysql_net_read_packet(MYSQL *mysql);
+unsigned long mysql_net_field_length(unsigned char **packet);