diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2009-06-11 12:07:59 +0200 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2009-06-11 12:07:59 +0200 |
| commit | 506c7fd47dd28e5726852e47d117bfbb37677005 (patch) | |
| tree | 796cc97d1d103e18e0672d9b57dee4c54857073c /sql/net_serv.cc | |
| parent | 4557f4ee9e9975966be6fa7c4fa553b30992ca6d (diff) | |
| parent | fbb96b339ae5fcce19446fd27a2fb75e49b960f8 (diff) | |
| download | mariadb-git-506c7fd47dd28e5726852e47d117bfbb37677005.tar.gz | |
Merge MySQL 5.1.35 into MySQL 5.4
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 ed47e4b9c7b..8ee819bcbda 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -250,7 +250,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); @@ -443,7 +443,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; int rc; @@ -517,7 +517,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); |