diff options
| author | Ignacio Galarza <iggy@mysql.com> | 2009-02-13 11:41:47 -0500 |
|---|---|---|
| committer | Ignacio Galarza <iggy@mysql.com> | 2009-02-13 11:41:47 -0500 |
| commit | 2d9421c3bb7376bcfa5484d94b45df65d67e4468 (patch) | |
| tree | 85b39362efeae16536a90f3a3624acd6916d4305 /sql/net_serv.cc | |
| parent | bf63b815faa9b6dd14253b28aabaf48ba178fe5a (diff) | |
| parent | 2b85c64d65385297f4a90265ae47cb298891dd5f (diff) | |
| download | mariadb-git-2d9421c3bb7376bcfa5484d94b45df65d67e4468.tar.gz | |
Bug#29125 Windows Server X64: so many compiler warnings
- Remove bothersome warning messages. This change focuses on the warnings
that are covered by the ignore file: support-files/compiler_warnings.supp.
- Strings are guaranteed to be max uint in length
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index 1098e8e6832..0a8720bae64 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -249,7 +249,7 @@ static int net_data_is_ready(my_socket sd) tv.tv_sec= tv.tv_usec= 0; - if ((res= select(sd+1, &sfds, NULL, NULL, &tv)) < 0) + if ((res= select((int) (sd + 1), &sfds, NULL, NULL, &tv)) < 0) return 0; else return test(res ? FD_ISSET(sd, &sfds) : 0); @@ -429,7 +429,7 @@ net_write_command(NET *net,uchar command, const uchar *header, size_t head_len, const uchar *packet, size_t len) { - ulong length=len+1+head_len; /* 1 extra byte for command */ + size_t length=len+1+head_len; /* 1 extra byte for command */ uchar buff[NET_HEADER_SIZE+1]; uint header_size=NET_HEADER_SIZE+1; DBUG_ENTER("net_write_command"); @@ -495,7 +495,7 @@ net_write_buff(NET *net, const uchar *packet, ulong len) { ulong left_length; if (net->compress && net->max_packet > MAX_PACKET_LENGTH) - left_length= MAX_PACKET_LENGTH - (net->write_pos - net->buff); + left_length= (ulong) (MAX_PACKET_LENGTH - (net->write_pos - net->buff)); else left_length= (ulong) (net->buff_end - net->write_pos); |