diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-11 20:51:09 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-11 20:51:09 +0200 |
| commit | 7ae555c1148f190f91d00499c2541fe7c2d4f555 (patch) | |
| tree | 861c0054243efee45b7a4b72135f897afc8972ba /sql/net_serv.cc | |
| parent | b9631e310b7cadf8711eef643e432d7e816680b4 (diff) | |
| parent | 754e7eff2872995e2b6e62f9da7448587a411c7b (diff) | |
| download | mariadb-git-7ae555c1148f190f91d00499c2541fe7c2d4f555.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
80% reverted
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 4b78492c857..a280fcf4cf4 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -1,5 +1,5 @@ -/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. - Copyright (c) 2012, Monty Program Ab +/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. + Copyright (c) 2012, 2016, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -885,7 +885,7 @@ my_real_read(NET *net, size_t *complen) my_progname,vio_errno(net->vio)); } #ifndef MYSQL_SERVER - if (vio_errno(net->vio) == SOCKET_EINTR) + if ((long)length < 0 && vio_errno(net->vio) == SOCKET_EINTR) { DBUG_PRINT("warning",("Interrupted read. Retrying...")); continue; |