1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge bk-internal:/home/bk/mysql-4.1

Browse Source 
into mysql.com:/home/jimw/my/mysql-4.1-clean
This commit is contained in:
jimw@mysql.com 2005-01-24 15:39:41 -08:00
commit 7454f2f097
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
vio/viosocket.c
View File

@ -142,23 +142,29 @@ int vio_fastsend(Vio * vio __attribute__((unused)))
int r=0; int r=0;
DBUG_ENTER("vio_fastsend"); DBUG_ENTER("vio_fastsend");
#ifdef IPTOS_THROUGHPUT #if defined(IPTOS_THROUGHPUT) && !defined(__EMX__)
{ {
#ifndef __EMX__
int tos = IPTOS_THROUGHPUT; int tos = IPTOS_THROUGHPUT;
if (!setsockopt(vio->sd, IPPROTO_IP, IP_TOS, (void *) &tos, sizeof(tos))) r= setsockopt(vio->sd, IPPROTO_IP, IP_TOS, (void *) &tos, sizeof(tos));
#endif /* !__EMX__ */ }
#endif /* IPTOS_THROUGHPUT && !__EMX__ */
if (!r)
{ {
#ifdef __WIN__
BOOL nodelay= 1;
r= setsockopt(vio->sd, IPPROTO_TCP, TCP_NODELAY, (const char*) &nodelay,
sizeof(nodelay));
#else
int nodelay = 1; int nodelay = 1;
if (setsockopt(vio->sd, IPPROTO_TCP, TCP_NODELAY, (void *) &nodelay, r= setsockopt(vio->sd, IPPROTO_TCP, TCP_NODELAY, (void*) &nodelay,
sizeof(nodelay))) { sizeof(nodelay));
DBUG_PRINT("warning", #endif /* __WIN__ */
("Couldn't set socket option for fast send")); }
if (r)
{
DBUG_PRINT("warning", ("Couldn't set socket option for fast send"));
r= -1; r= -1;
} }
}
}
#endif /* IPTOS_THROUGHPUT */
DBUG_PRINT("exit", ("%d", r)); DBUG_PRINT("exit", ("%d", r));
DBUG_RETURN(r); DBUG_RETURN(r);
} }