bk commit into 4.1 tree (gluh:1.2473) BUG#14221

[gluh]

Below is the list of changes that have just been committed into a local
4.1 repository of gluh. When gluh 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
  1.2473 05/11/18 13:36:32 gluh@stripped +1 -0
  Fix for bug#14221 SSL support breaks going from OpenSSL 0.9.7i to 0.9.8a
  use SSL_library_init() instead of OpenSSL_add_all_algorithms();

  vio/viosslfactories.c
    1.17 05/11/18 13:35:41 gluh@stripped +10 -14
    Fix for bug#14221 SSL support breaks going from OpenSSL 0.9.7i to 0.9.8a
    use SSL_library_init() instead of OpenSSL_add_all_algorithms();

# 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:	gluh
# Host:	eagle.intranet.mysql.r18.ru
# Root:	/home/gluh/MySQL/Bugs/4.1.14221

--- 1.16/vio/viosslfactories.c	Wed May 26 00:00:12 2004
+++ 1.17/vio/viosslfactories.c	Fri Nov 18 13:35:41 2005
@@ -191,9 +191,6 @@
 /* NetWare SSL initialization */
 static void netware_ssl_init()
 {
-  /* initialize OpenSSL library */
-  SSL_library_init();
-
   /* cleanup OpenSSL library */
   NXVmRegisterExitHandler(netware_ssl_cleanup, NULL);
 }
@@ -231,16 +228,16 @@
   ptr->ssl_method=  0;
   /* FIXME: constants! */
 
-#ifdef __NETWARE__
-  netware_ssl_init();
-#endif
-
   if (!ssl_algorithms_added)
   {
     DBUG_PRINT("info", ("todo: OpenSSL_add_all_algorithms()"));
     ssl_algorithms_added = TRUE;
-    OpenSSL_add_all_algorithms();
+    SSL_library_init();
   }
+#ifdef __NETWARE__
+  netware_ssl_init();
+#endif
+
   if (!ssl_error_strings_loaded)
   {
     DBUG_PRINT("info", ("todo:SSL_load_error_strings()"));
@@ -325,17 +322,16 @@
   /* FIXME: constants! */
   ptr->session_id_context= ptr;
 
-#ifdef __NETWARE__
-  netware_ssl_init();
-#endif
-
   if (!ssl_algorithms_added)
   {
     DBUG_PRINT("info", ("todo: OpenSSL_add_all_algorithms()"));
     ssl_algorithms_added = TRUE;
-    OpenSSL_add_all_algorithms();
-
+    SSL_library_init();
   }
+#ifdef __NETWARE__
+  netware_ssl_init();
+#endif
+
   if (!ssl_error_strings_loaded)
   {
     DBUG_PRINT("info", ("todo: SSL_load_error_strings()"));