From f8b32417266793b2cad9d452f7c5731f9607fbf9 Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.blaudden" <>
Date: Wed, 28 Mar 2007 15:34:52 +0200
Subject: [PATCH 1/2] Set yaSSL to use same type as MySQL do for socket handles

---
 extra/yassl/include/openssl/ssl.h | 10 ++++++++--
 extra/yassl/src/ssl.cpp           |  2 +-
 include/violite.h                 |  3 +++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/extra/yassl/include/openssl/ssl.h b/extra/yassl/include/openssl/ssl.h
index 29add5ca37d..7dd33e3fcad 100644
--- a/extra/yassl/include/openssl/ssl.h
+++ b/extra/yassl/include/openssl/ssl.h
@@ -190,11 +190,17 @@ enum {  /* ERR Constants */
     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);
diff --git a/extra/yassl/src/ssl.cpp b/extra/yassl/src/ssl.cpp
index 5bbde13a652..5ccc45ded2a 100644
--- a/extra/yassl/src/ssl.cpp
+++ b/extra/yassl/src/ssl.cpp
@@ -229,7 +229,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;
diff --git a/include/violite.h b/include/violite.h
index 4122e581a0f..63388c170c9 100644
--- a/include/violite.h
+++ b/include/violite.h
@@ -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>
 

From c2bbf3c05e0cc9bb27b6668954fc0c4e0e507ffb Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.blaudden" <>
Date: Wed, 28 Mar 2007 15:56:57 +0200
Subject: [PATCH 2/2] Add back the look for exe_mysql

---
 mysql-test/mysql-test-run.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index b97c3917285..9187e3d23ec 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1519,6 +1519,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)
   {