Commit f5db9c9a authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
parents ebfa6c2d fee8f2d2

client/mysqltest.c

+1 −1
Original line number Diff line number Diff line
@@ -1741,7 +1741,7 @@ int safe_connect(MYSQL* con, const char* host, const char* user, 
  for (i = 0; i < MAX_CON_TRIES; ++i)

  {

    if (mysql_real_connect(con, host,user, pass, db, port, sock,

			   CLIENT_MULTI_STATEMENTS))

			   CLIENT_MULTI_STATEMENTS | CLIENT_REMEMBER_OPTIONS))

    {

      con_error = 0;

      break;

extra/yassl/src/socket_wrapper.cpp

+6 −2
Original line number Diff line number Diff line
@@ -93,11 +93,15 @@ void Socket::closeSocket() 


uint Socket::get_ready() const

{

    unsigned long ready = 0;



#ifdef _WIN32

    unsigned long ready = 0;

    ioctlsocket(socket_, FIONREAD, &ready);

#else

    /*

      64-bit Solaris requires the variable passed to

      FIONREAD be a 32-bit value.

    */

    int ready = 0;

    ioctl(socket_, FIONREAD, &ready);

#endif

sql/sql_parse.cc

+2 −3
Original line number Diff line number Diff line
@@ -919,8 +919,7 @@ static int check_connection(THD *thd) 
    DBUG_PRINT("info", ("IO layer change in progress..."));

    if (sslaccept(ssl_acceptor_fd, net->vio, thd->variables.net_wait_timeout))

    {

      DBUG_PRINT("error", ("Failed to read user information (pkt_len= %lu)",

			   pkt_len));

      DBUG_PRINT("error", ("Failed to accept new SSL connection"));

      inc_host_errors(&thd->remote.sin_addr);

      return(ER_HANDSHAKE_ERROR);

    }

vio/viossl.c

+4 −3
Original line number Diff line number Diff line
@@ -285,7 +285,8 @@ int sslaccept(struct st_VioSSLAcceptorFd* ptr, Vio* vio, long timeout) 
  my_bool net_blocking;

  enum enum_vio_type old_type;

  DBUG_ENTER("sslaccept");

  DBUG_PRINT("enter", ("sd: %d  ptr: Ox%p", vio->sd,ptr));

  DBUG_PRINT("enter", ("sd: %d  ptr: Ox%p, timeout: %d",

                       vio->sd, ptr, timeout));



  old_type= vio->type;

  net_blocking = vio_is_blocking(vio);
@@ -379,7 +380,7 @@ int sslconnect(struct st_VioSSLConnectorFd* ptr, Vio* vio, long timeout) 
                      (SSL*) vio->ssl_arg, timeout));

  SSL_clear((SSL*) vio->ssl_arg);

  SSL_SESSION_set_timeout(SSL_get_session((SSL*) vio->ssl_arg), timeout);

  SSL_set_fd ((SSL*) vio->ssl_arg, vio->sd);

  SSL_set_fd ((SSL*) vio->ssl_arg, vio_ssl_fd(vio));

  SSL_set_connect_state((SSL*) vio->ssl_arg);

  if (SSL_do_handshake((SSL*) vio->ssl_arg) < 1)

  {

vio/viosslfactories.c

+0 −6
Original line number Diff line number Diff line
@@ -219,9 +219,6 @@ new_VioSSLConnectorFd(const char* key_file, 
  int result;

  DH *dh;

  DBUG_ENTER("new_VioSSLConnectorFd");

  DBUG_PRINT("enter",

	     ("key_file: %s, cert_file: %s, ca_path: %s, ca_file: %s, cipher: %s",

	      key_file, cert_file, ca_path, ca_file, cipher));



  if (!(ptr=((struct st_VioSSLConnectorFd*)

	     my_malloc(sizeof(struct st_VioSSLConnectorFd),MYF(0)))))
@@ -314,9 +311,6 @@ new_VioSSLAcceptorFd(const char *key_file, 
  int result;

  DH *dh;

  DBUG_ENTER("new_VioSSLAcceptorFd");

  DBUG_PRINT("enter",

	     ("key_file: %s, cert_file: %s, ca_path: %s, ca_file: %s, cipher: %s",

	      key_file, cert_file, ca_path, ca_file, cipher));



  ptr= ((struct st_VioSSLAcceptorFd*)

	my_malloc(sizeof(struct st_VioSSLAcceptorFd),MYF(0)));