summaryrefslogtreecommitdiff
path: root/vio
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2018-08-12 00:56:07 +0100
committerVladislav Vaintroub <wlad@mariadb.com>2018-08-12 00:56:07 +0100
commitb05ee14d950ef2dc141431877c17f7145a07da17 (patch)
tree0a537b044a3a11cc6d6866fb4493925b6bf11acd /vio
parent077e590bbc60d3b2c20ff5dec039c47414a4ecdd (diff)
downloadmariadb-git-b05ee14d950ef2dc141431877c17f7145a07da17.tar.gz
MDEV-16277 - fix tcp_nodelay test.
Do not attempt to set TCP_NODELAY on Unix domain socket.
Diffstat (limited to 'vio')
-rw-r--r--vio/viosocket.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/vio/viosocket.c b/vio/viosocket.c
index 05c20c58bf8..dbc66e288b6 100644
--- a/vio/viosocket.c
+++ b/vio/viosocket.c
@@ -442,7 +442,8 @@ int vio_nodelay(Vio *vio, my_bool on)
int no_delay= MY_TEST(on);
DBUG_ENTER("vio_nodelay");
- if (vio->type == VIO_TYPE_NAMEDPIPE || vio->type == VIO_TYPE_SHARED_MEMORY)
+ if (vio->type == VIO_TYPE_NAMEDPIPE || vio->type == VIO_TYPE_SHARED_MEMORY
+ || vio->type == VIO_TYPE_SOCKET)
{
DBUG_RETURN(0);
}