mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-10 00:54:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge bk-internal.mysql.com:/users/rburnett/bug9721

Browse source 
into bk-internal.mysql.com:/users/rburnett/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
include/violite.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
vio/viosocket.c:
  Auto merged
vio/viossl.c:
  Auto merged
This commit is contained in:
unknown 2005-05-06 15:15:48 +02:00
commit 4576776010
7 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
vio/vio_priv.h
View file

@ -23,7 +23,7 @@
#include <m_string.h>
#include <violite.h>
void vio_ignore_timeout(Vio *vio, uint timeout);
void vio_ignore_timeout(Vio *vio, uint which, uint timeout);
#ifdef HAVE_OPENSSL
#include "my_net.h" /* needed because of struct in_addr */
@ -31,7 +31,7 @@ void vio_ignore_timeout(Vio *vio, uint timeout);
void vio_ssl_delete(Vio* vio);
int vio_ssl_read(Vio *vio,gptr buf, int size);
int vio_ssl_write(Vio *vio,const gptr buf,int size);
void vio_ssl_timeout(Vio *vio, uint timeout);
void vio_ssl_timeout(Vio *vio, uint which, uint timeout);
/* setsockopt TCP_NODELAY at IPPROTO_TCP level, when possible. */
int vio_ssl_fastsend(Vio *vio);

8
vio/viosocket.c
View file

@ -364,12 +364,14 @@ my_bool vio_poll_read(Vio *vio,uint timeout)
void vio_timeout(Vio *vio __attribute__((unused)),
uint timeout __attribute__((unused)))
uint which __attribute__((unused)),
uint timeout __attribute__((unused)))
{
#ifdef __WIN__
ulong wait_timeout= (ulong) timeout * 1000;
(void) setsockopt(vio->sd, SOL_SOCKET, SO_RCVTIMEO, (char*) &wait_timeout,
sizeof(wait_timeout));
(void) setsockopt(vio->sd, SOL_SOCKET,
which ? SO_SNDTIMEO : SO_RCVTIMEO, (char*) &wait_timeout,
sizeof(wait_timeout));
#endif /* __WIN__ */
}

3
vio/viossl.c
View file

@ -424,7 +424,8 @@ int vio_ssl_blocking(Vio * vio __attribute__((unused)),
void vio_ssl_timeout(Vio *vio __attribute__((unused)),
uint timeout __attribute__((unused)))
uint which __attribute__((unused)),
uint timeout __attribute__((unused)))
{
/* Not yet implemented (non critical) */
}