database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Merge branch '5.5' into 10.0

Browse Source
This commit is contained in:
Sergei Golubchik
2015-02-18 15:16:27 +01:00
parent a06624d61f fdd6c111c2
commit d7e7862364
120 changed files with 3358 additions and 1860 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/mysql.h.pp
View File

@@ -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);