database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-11187: Server does not compile on labrador

Browse Source
This commit is contained in:
Kristian Nielsen
2016-10-31 07:35:02 +01:00
parent 39d2c7b18d
commit 40ad946683
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/mysql.h.pp
View File

@@ -109,8 +109,8 @@ my_bool net_write_command(NET *net,unsigned char command,
const unsigned char *packet, size_t len); const unsigned char *packet, size_t len);
int net_real_write(NET *net,const unsigned char *packet, size_t len); int net_real_write(NET *net,const unsigned char *packet, size_t len);
unsigned long my_net_read_packet(NET *net, my_bool read_from_server); unsigned long my_net_read_packet(NET *net, my_bool read_from_server);
ulong my_net_read_packet_reallen(NET *net, my_bool read_from_server, unsigned long my_net_read_packet_reallen(NET *net, my_bool read_from_server,
ulong* reallen); unsigned long* reallen);
struct sockaddr; struct sockaddr;
int my_connect(my_socket s, const struct sockaddr *name, unsigned int namelen, int my_connect(my_socket s, const struct sockaddr *name, unsigned int namelen,
unsigned int timeout); unsigned int timeout);

4
include/mysql_com.h
View File

@@ -585,8 +585,8 @@ my_bool net_write_command(NET *net,unsigned char command,
const unsigned char *packet, size_t len); const unsigned char *packet, size_t len);
int net_real_write(NET *net,const unsigned char *packet, size_t len); int net_real_write(NET *net,const unsigned char *packet, size_t len);
unsigned long my_net_read_packet(NET *net, my_bool read_from_server); unsigned long my_net_read_packet(NET *net, my_bool read_from_server);
ulong my_net_read_packet_reallen(NET *net, my_bool read_from_server, unsigned long my_net_read_packet_reallen(NET *net, my_bool read_from_server,
ulong* reallen); unsigned long* reallen);
#define my_net_read(A) my_net_read_packet((A), 0) #define my_net_read(A) my_net_read_packet((A), 0)
#ifdef MY_GLOBAL_INCLUDED #ifdef MY_GLOBAL_INCLUDED