database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge work.mysql.com:/home/bk/mysql-4.0

Browse Source 
into x153.internalnet:/home/tonu/mysql-x
This commit is contained in:
tonu@x153.internalnet
2001-07-24 15:00:36 +08:00
parent 27caeeac7f 85c287a439
commit e1fa72edef
21 changed files with 513 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sql/mysqld.cc
View File

@ -693,6 +693,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));