[Commits] 40ad946: MDEV-11187: Server does not compile on labrador

Kristian Nielsen knielsen at knielsen-hq.org
Mon Oct 31 08:35:06 EET 2016


revision-id: 40ad9466830cd16793fb892180aae2bf491ce348 (mariadb-10.2.2-58-g40ad946)
parent(s): 39d2c7b18d6e5f2fb7cb6ec368e3ee2b5a405b10
author: Kristian Nielsen
committer: Kristian Nielsen
timestamp: 2016-10-31 07:35:02 +0100
message:

MDEV-11187: Server does not compile on labrador

---
 include/mysql.h.pp  | 4 ++--
 include/mysql_com.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/mysql.h.pp b/include/mysql.h.pp
index 714b26b..1ce4c05 100644
--- a/include/mysql.h.pp
+++ b/include/mysql.h.pp
@@ -109,8 +109,8 @@ my_bool net_write_command(NET *net,unsigned char command,
      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);
-ulong my_net_read_packet_reallen(NET *net, my_bool read_from_server,
-                                 ulong* reallen);
+unsigned long my_net_read_packet_reallen(NET *net, my_bool read_from_server,
+                                         unsigned long* reallen);
 struct sockaddr;
 int my_connect(my_socket s, const struct sockaddr *name, unsigned int namelen,
         unsigned int timeout);
diff --git a/include/mysql_com.h b/include/mysql_com.h
index 60a3c9f..57e3115 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -585,8 +585,8 @@ my_bool	net_write_command(NET *net,unsigned char command,
 			  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);
-ulong my_net_read_packet_reallen(NET *net, my_bool read_from_server, 
-                                 ulong* reallen);
+unsigned long my_net_read_packet_reallen(NET *net, my_bool read_from_server,
+                                         unsigned long* reallen);
 #define my_net_read(A) my_net_read_packet((A), 0)
 
 #ifdef MY_GLOBAL_INCLUDED


More information about the commits mailing list