diff options
| author | unknown <jimw@mysql.com> | 2005-11-29 15:33:58 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-11-29 15:33:58 -0800 |
| commit | d9d1337e2e1772c8a08051caa71234681d9845b5 (patch) | |
| tree | d4e212a2385d1df6283bfca8b3cace1b20ed1de1 /vio | |
| parent | e77da4fc83cc2cbacad9be4c9efc4704224cf660 (diff) | |
| parent | a171aa693e7f1c28ce67761621d032704fabde70 (diff) | |
| download | mariadb-git-d9d1337e2e1772c8a08051caa71234681d9845b5.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/r/union.result:
Auto merged
sql/item.cc:
Auto merged
vio/viosslfactories.c:
Auto merged
mysql-test/t/union.test:
Resolve conflict
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/viosslfactories.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c index 766d835d2c0..4ee27f1e491 100644 --- a/vio/viosslfactories.c +++ b/vio/viosslfactories.c @@ -191,9 +191,6 @@ void netware_ssl_cleanup() /* NetWare SSL initialization */ static void netware_ssl_init() { - /* initialize OpenSSL library */ - SSL_library_init(); - /* cleanup OpenSSL library */ NXVmRegisterExitHandler(netware_ssl_cleanup, NULL); } @@ -228,16 +225,17 @@ new_VioSSLConnectorFd(const char* key_file, 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; + SSL_library_init(); OpenSSL_add_all_algorithms(); } +#ifdef __NETWARE__ + netware_ssl_init(); +#endif + if (!ssl_error_strings_loaded) { DBUG_PRINT("info", ("todo:SSL_load_error_strings()")); @@ -319,17 +317,18 @@ new_VioSSLAcceptorFd(const char *key_file, /* 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; + SSL_library_init(); OpenSSL_add_all_algorithms(); } +#ifdef __NETWARE__ + netware_ssl_init(); +#endif + if (!ssl_error_strings_loaded) { DBUG_PRINT("info", ("todo: SSL_load_error_strings()")); |