Commit 45767760 authored by unknown's avatar unknown
Browse files

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

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
parents 0baed276 6b819860

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -225,6 +225,7 @@ ram@ram-book.(none) 
ram@ram.(none)

ramil@mysql.com

ranger@regul.home.lan

rburnett@bk-internal.mysql.com

rburnett@build.mysql.com

reggie@bob.(none)

reggie@mdk10.(none)

include/violite.h

+3 −3
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ my_bool vio_peer_addr(Vio* vio, char *buf, uint16 *port); 
/* Remotes in_addr */

void	vio_in_addr(Vio *vio, struct in_addr *in);

my_bool	vio_poll_read(Vio *vio,uint timeout);

void	vio_timeout(Vio *vio,uint timeout);

void	vio_timeout(Vio *vio,uint which, uint timeout);



#ifdef HAVE_OPENSSL

#include <openssl/opensslv.h>
@@ -156,7 +156,7 @@ int vio_close_shared_memory(Vio * vio); 
#define vio_close(vio)				((vio)->vioclose)(vio)

#define vio_peer_addr(vio, buf, prt)		(vio)->peer_addr(vio, buf, prt)

#define vio_in_addr(vio, in)			(vio)->in_addr(vio, in)

#define vio_timeout(vio, seconds)			(vio)->timeout(vio, seconds)

#define vio_timeout(vio, which, seconds)	(vio)->timeout(vio, which, seconds)

#endif /* !defined(DONT_MAP_VIO) */



/* This enumerator is used in parser - should be always visible */
@@ -199,7 +199,7 @@ struct st_vio 
  void    (*in_addr)(Vio*, struct in_addr*);

  my_bool (*should_retry)(Vio*);

  int     (*vioclose)(Vio*);

  void	  (*timeout)(Vio*, unsigned int timeout);

  void	  (*timeout)(Vio*, unsigned int which, unsigned int timeout);

  void	  *ssl_arg;

#ifdef HAVE_SMEM

  HANDLE  handle_file_map;

ndb/src/kernel/error/ErrorReporter.cpp

+5 −0
Original line number Diff line number Diff line
@@ -237,6 +237,11 @@ WriteMessage(ErrorCategory thrdType, int thrdMessageID, 
    // Create a new file, and skip the first 69 bytes, 

    // which are info about the current offset

    stream = fopen(theErrorFileName, "w");

    if(stream == NULL)

    {

      fprintf(stderr,"Unable to open error log file: %s\n", theErrorFileName);

      return -1;

    }

    fprintf(stream, "%s%u%s", "Current byte-offset of file-pointer is: ", 69,

	    "                        \n\n\n");

sql/net_serv.cc

+2 −2
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ net_real_write(NET *net,const char *packet,ulong len) 
    thr_alarm(&alarmed,(uint) net->write_timeout,&alarm_buff);

#else

  alarmed=0;

  vio_timeout(net->vio, net->write_timeout);

  vio_timeout(net->vio, 1, net->write_timeout);

#endif /* NO_ALARM */



  pos=(char*) packet; end=pos+len;
@@ -688,7 +688,7 @@ my_real_read(NET *net, ulong *complen) 
  if (net_blocking)

    thr_alarm(&alarmed,net->read_timeout,&alarm_buff);

#else

  vio_timeout(net->vio, net->read_timeout);

  vio_timeout(net->vio, 0, net->read_timeout);

#endif /* NO_ALARM */



    pos = net->buff + net->where_b;		/* net->packet -4 */

vio/vio_priv.h

+2 −2
Original line number Diff line number Diff line
@@ -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);