bk commit into 5.1 tree (msvensson:1.2516)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-28 15:57:27+02:00, msvensson@stripped +4 -0
  Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
  into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
  MERGE: 1.1810.2374.100

  extra/yassl/include/openssl/ssl.h@stripped, 2007-03-28 15:57:24+02:00,
msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.14.1.9

  extra/yassl/src/ssl.cpp@stripped, 2007-03-28 15:57:24+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.16.1.13

  include/violite.h@stripped, 2007-03-28 15:57:24+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.46.2.4

  mysql-test/mysql-test-run.pl@stripped, 2007-03-28 15:57:24+02:00, msvensson@stripped
+0 -0
    Auto merged
    MERGE: 1.30.49.71

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/mysql-5.1-maint/RESYNC

--- 1.53/include/violite.h	2006-12-23 20:19:45 +01:00
+++ 1.54/include/violite.h	2007-03-28 15:57:24 +02:00
@@ -102,6 +102,9 @@ void	vio_timeout(Vio *vio,uint which, ui
 #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>
 

--- 1.291/mysql-test/mysql-test-run.pl	2007-03-28 11:17:05 +02:00
+++ 1.292/mysql-test/mysql-test-run.pl	2007-03-28 15:57:24 +02:00
@@ -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)
   {

--- 1.25/extra/yassl/include/openssl/ssl.h	2007-03-23 13:43:07 +01:00
+++ 1.26/extra/yassl/include/openssl/ssl.h	2007-03-28 15:57:24 +02:00
@@ -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);

--- 1.32/extra/yassl/src/ssl.cpp	2007-03-23 17:15:42 +01:00
+++ 1.33/extra/yassl/src/ssl.cpp	2007-03-28 15:57:24 +02:00
@@ -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;