diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-04-12 12:52:34 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-04-12 12:52:34 +0200 |
| commit | 6af90061f42a0cbdc4f59e5390471b008e24d252 (patch) | |
| tree | b54fecadb68c73afdbd6200942aba915902f2d84 /sql/mysqld.cc | |
| parent | 10633fd8397f8450b5076bb98f336f6d20967b5d (diff) | |
| parent | b2d5243e97b7395d38bd6afc4767199703cf7f7c (diff) | |
| download | mariadb-git-6af90061f42a0cbdc4f59e5390471b008e24d252.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/bug17208/my50-bug17208
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_acl.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 9dd37bbebc9..d65383b497a 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -596,7 +596,7 @@ static void openssl_lock(int, openssl_lock_t *, const char *, int); static unsigned long openssl_id_function(); #endif char *des_key_file; -struct st_VioSSLAcceptorFd *ssl_acceptor_fd; +struct st_VioSSLFd *ssl_acceptor_fd; #endif /* HAVE_OPENSSL */ @@ -1107,7 +1107,10 @@ void clean_up(bool print_message) #endif #ifdef HAVE_OPENSSL if (ssl_acceptor_fd) - my_free((gptr) ssl_acceptor_fd, MYF(MY_ALLOW_ZERO_PTR)); + { + SSL_CTX_free(ssl_acceptor_fd->ssl_context); + my_free((gptr) ssl_acceptor_fd, MYF(0)); + } #endif /* HAVE_OPENSSL */ #ifdef USE_REGEX my_regex_end(); |