diff options
Diffstat (limited to 'sql/mf_iocache.cc')
| -rw-r--r-- | sql/mf_iocache.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/mf_iocache.cc b/sql/mf_iocache.cc index 3d3b4da11db..495d78804b0 100644 --- a/sql/mf_iocache.cc +++ b/sql/mf_iocache.cc @@ -49,8 +49,7 @@ extern "C" { */ -int _my_b_net_read(register IO_CACHE *info, uchar *Buffer, - size_t Count __attribute__((unused))) +int _my_b_net_read(IO_CACHE *info, uchar *Buffer, size_t) { ulong read_length; NET *net= &(current_thd)->net; @@ -59,12 +58,12 @@ int _my_b_net_read(register IO_CACHE *info, uchar *Buffer, if (!info->end_of_file) DBUG_RETURN(1); /* because my_b_get (no _) takes 1 byte at a time */ read_length= my_net_read_packet(net, 0); - if (read_length == packet_error) + if (unlikely(read_length == packet_error)) { info->error= -1; DBUG_RETURN(1); } - if (read_length == 0) + if (unlikely(read_length == 0)) { info->end_of_file= 0; /* End of file from client */ DBUG_RETURN(1); |