diff --git a/sql-common/client.c b/sql-common/client.c
index 58d82b5b801..f9219e5418d 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -547,6 +547,10 @@ net_safe_read(MYSQL *mysql)
   {
     DBUG_PRINT("error",("Wrong connection or packet. fd: %s  len: %d",
 			vio_description(net->vio),len));
+#ifdef MYSQL_SERVER
+    if (socket_errno == SOCKET_EINTR)
+      return (packet_error);
+#endif /*MYSQL_SERVER*/
     end_server(mysql);
     net->last_errno=(net->last_errno == ER_NET_PACKET_TOO_LARGE ?
 		     CR_NET_PACKET_TOO_LARGE: