database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new

Browse Source 
into  mysql.com:/home/my/mysql-5.1


mysql-test/t/mysqldump.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_table.cc:
  After merge fix
sql/sql_show.cc:
  Auto merged
This commit is contained in:
unknown
2006-05-04 01:58:21 +03:00
parent 462a43e16b 3c099551d0
commit 26fe4bf90b
44 changed files with 629 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/mysqld.cc
View File

@ -742,6 +742,7 @@ static void clean_up_mutexes(void);
static void wait_for_signal_thread_to_end(void);
static int test_if_case_insensitive(const char *dir_name);
static void create_pid_file();
static void end_ssl();
#ifndef EMBEDDED_LIBRARY
/****************************************************************************
@ -1217,10 +1218,7 @@ void clean_up(bool print_message)
#endif
delete binlog_filter;
delete rpl_filter;
#ifdef HAVE_OPENSSL
if (ssl_acceptor_fd)
my_free((gptr) ssl_acceptor_fd, MYF(MY_ALLOW_ZERO_PTR));
#endif /* HAVE_OPENSSL */
end_ssl();
#ifdef USE_REGEX
my_regex_end();
#endif
@ -2962,6 +2960,18 @@ static void init_ssl()
}
static void end_ssl()
{
#ifdef HAVE_OPENSSL
if (ssl_acceptor_fd)
{
free_vio_ssl_acceptor_fd(ssl_acceptor_fd);
ssl_acceptor_fd= 0;
}
#endif /* HAVE_OPENSSL */
}
static int init_server_components()
{
DBUG_ENTER("init_server_components");