summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authortonu@x153.internalnet <>2001-07-24 14:07:46 +0800
committertonu@x153.internalnet <>2001-07-24 14:07:46 +0800
commit85c287a43937ecbafc67dde08b438c60ed1f659f (patch)
treeed5f3121d49f4cd731f353d0ff4b0684837cc5b5 /sql/mysqld.cc
parent248234f1d6931a32135bf8fffc7f4e0122f1f2b1 (diff)
downloadmariadb-git-85c287a43937ecbafc67dde08b438c60ed1f659f.tar.gz
OpenSSL fixes. Should not affect anything else.
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc22
1 files changed, 22 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 7c40b5f15ef..40b157780da 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -692,6 +692,28 @@ void clean_up(bool print_message)
#ifdef USE_RAID
end_raid();
#endif
+#ifdef HAVE_OPENSSL
+ if(opt_ssl_key) {
+ my_free(opt_ssl_key,MYF(0));
+ opt_ssl_key=0;
+ }
+ if(opt_ssl_cert) {
+ my_free(opt_ssl_cert,MYF(0));
+ opt_ssl_cert=0;
+ }
+ if(opt_ssl_ca) {
+ my_free(opt_ssl_ca,MYF(0));
+ opt_ssl_ca=0;
+ }
+ if(opt_ssl_capath) {
+ my_free(opt_ssl_capath,MYF(0));
+ opt_ssl_capath=0;
+ }
+ if(ssl_acceptor_fd) {
+ my_free((gptr)ssl_acceptor_fd,MYF(0));
+ ssl_acceptor_fd=0;
+ }
+#endif /* HAVE_OPENSSL */
free_defaults(defaults_argv);
my_free(charsets_list, MYF(MY_ALLOW_ZERO_PTR));
my_free(mysql_tmpdir,MYF(0));