bk commit into 5.0 tree (msvensson:1.2328)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 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, 2006-10-24 10:43:15+02:00, msvensson@neptunus.(none) +2 -0
  When using yaSSL on NetWare some of the OpenSSL specifix hacks can be skipped

  vio/viossl.c@stripped, 2006-10-24 10:43:13+02:00, msvensson@neptunus.(none) +5 -0
    No need for special code to switch from WinSock to BSD sockets when using yaSSL

  vio/viosslfactories.c@stripped, 2006-10-24 10:43:13+02:00, msvensson@neptunus.(none) +4 -0
    The OpenSSL port to NetWare has added some extra functions to free up memory, no need
    to call them when using yaSSL 

# 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:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0-maint

--- 1.36/vio/viossl.c	2006-10-24 10:43:20 +02:00
+++ 1.37/vio/viossl.c	2006-10-24 10:43:20 +02:00
@@ -26,6 +26,10 @@
 #ifdef HAVE_OPENSSL
 
 #ifdef __NETWARE__
+
+/* yaSSL already uses BSD sockets */
+#ifndef HAVE_YASSL
+
 /*
   The default OpenSSL implementation on NetWare uses WinSock.
   This code allows us to use the BSD sockets.
@@ -47,6 +51,7 @@
 
 #define SSL_set_fd(A, B)  SSL_set_fd_bsd((A), (B))
 
+#endif /* HAVE_YASSL */
 #endif /* __NETWARE__ */
 
 

--- 1.26/vio/viosslfactories.c	2006-10-24 10:43:20 +02:00
+++ 1.27/vio/viosslfactories.c	2006-10-24 10:43:20 +02:00
@@ -180,11 +180,15 @@
   /* free memory from SSL_library_init() */
   EVP_cleanup();
 
+/* OpenSSL NetWare port specific functions */
+#ifndef HAVE_YASSL
+
   /* free global X509 method */
   X509_STORE_method_cleanup();
 
   /* free the thread_hash error table */
   ERR_free_state_table();
+#endif
 }