diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-10-24 12:53:47 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-10-24 12:53:47 +0200 |
| commit | 8247821b387bdff641e2060381bd2b8dfd26362f (patch) | |
| tree | f49940b1731e72b01cbe18792f3d50b5e749da6b /vio/viosslfactories.c | |
| parent | dd7dbb39aa723b438cdb11558b703876e369fd82 (diff) | |
| parent | 375b04b9fe8826bd666b49421b5176a9316039e8 (diff) | |
| download | mariadb-git-8247821b387bdff641e2060381bd2b8dfd26362f.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
include/mysql.h:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
netware/BUILD/compile-netware-END:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
vio/viossl.c:
Auto merged
vio/viosslfactories.c:
Auto merged
netware/BUILD/mwenv:
Merge
Diffstat (limited to 'vio/viosslfactories.c')
| -rw-r--r-- | vio/viosslfactories.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c index ca7a96d5801..bce70078b3e 100644 --- a/vio/viosslfactories.c +++ b/vio/viosslfactories.c @@ -180,11 +180,15 @@ void netware_ssl_cleanup() /* 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 } |