Commit 70ae657c authored by unknown's avatar unknown
Browse files

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


extra/yassl/include/openssl/ssl.h:
  Auto merged
extra/yassl/src/ssl.cpp:
  Auto merged
include/violite.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
parents f86a489f 1778d177

extra/yassl/include/openssl/ssl.h

+8 −2
Original line number Diff line number Diff line
@@ -189,11 +189,17 @@ enum { /* ERR Constants */ 
    ERR_TXT_STRING = 1,

    EVP_R_BAD_DECRYPT = 2

};



/*

  Allow type used by SSL_set_fd to be changed, default to int

  in order to be compatible with OpenSSL

 */

#ifndef YASSL_SOCKET_T_DEFINED

typedef int YASSL_SOCKET_T;

#endif



SSL_CTX* SSL_CTX_new(SSL_METHOD*);

SSL* SSL_new(SSL_CTX*);

int  SSL_set_fd (SSL*, int);

int  SSL_set_fd (SSL*, YASSL_SOCKET_T);

int  SSL_connect(SSL*);

int  SSL_write(SSL*, const void*, int);

int  SSL_read(SSL*, void*, int);

extra/yassl/src/ssl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ void SSL_free(SSL* ssl) 
}





int SSL_set_fd(SSL* ssl, int fd)

int SSL_set_fd(SSL* ssl, YASSL_SOCKET_T fd)

{

    ssl->useSocket().set_fd(fd);

    return SSL_SUCCESS;

include/violite.h

+3 −0
Original line number Diff line number Diff line
@@ -102,6 +102,9 @@ void vio_timeout(Vio *vio,uint which, uint timeout); 
#define HEADER_DES_LOCL_H dummy_something

#define YASSL_MYSQL_COMPATIBLE

#define YASSL_PREFIX

/* Set yaSSL to use same type as MySQL do for socket handles */

typedef my_socket YASSL_SOCKET_T;

#define YASSL_SOCKET_T_DEFINED

#include <openssl/ssl.h>

#include <openssl/err.h>

mysql-test/mysql-test-run.pl

+1 −0
Original line number Diff line number Diff line
@@ -1520,6 +1520,7 @@ sub executable_setup () { 
  $exe_mysqlshow=      mtr_exe_exists("$path_client_bindir/mysqlshow");

  $exe_mysqlbinlog=    mtr_exe_exists("$path_client_bindir/mysqlbinlog");

  $exe_mysqladmin=     mtr_exe_exists("$path_client_bindir/mysqladmin");

  $exe_mysql=          mtr_exe_exists("$path_client_bindir/mysql");



  if (!$opt_extern)

  {