diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-05-12 08:45:22 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-05-12 08:45:22 +0200 |
| commit | 16d46c9cba395c05b796f59020383a1721e25611 (patch) | |
| tree | f5d617a778c49bf4f2f7afdb0d1bd526e1c5bba3 /sql/mysqld.cc | |
| parent | 060454516c696b4298abb5f9ecb3946bc131ba95 (diff) | |
| parent | d6c2616c3ff4f3035f140f1b2923186fc8ae3601 (diff) | |
| download | mariadb-git-16d46c9cba395c05b796f59020383a1721e25611.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
BitKeeper/deleted/.del-client-req.pem~efd482e1d290d4d8:
Auto merged
BitKeeper/deleted/.del-server-req.pem~16301893cacf1be4:
Auto merged
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqlimport.c:
Auto merged
BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
Auto merged
BitKeeper/deleted/.del-NOTES~e926d3e6929ac052:
Auto merged
client/mysqltest.c:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/std_data/cacert.pem:
Auto merged
mysql-test/std_data/client-cert.pem:
Auto merged
mysql-test/std_data/client-key.pem:
Auto merged
mysql-test/std_data/server-cert.pem:
Auto merged
mysql-test/std_data/server-key.pem:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
sql/item_func.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
Auto merged
vio/vio.c:
Auto merged
client/client_priv.h:
Merge 5.0 -> 5.1
include/violite.h:
Merge 5.0 -> 5.1
mysql-test/Makefile.am:
Merge 5.0 -> 5.1
mysql-test/t/disabled.def:
Merge 5.0 -> 5.1
sql/mysqld.cc:
Merge 5.0 -> 5.1
vio/viossl.c:
Merge 5.0 -> 5.1
vio/viosslfactories.c:
Merge 5.0 -> 5.1
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 0bae436cf78..0c02971a2bc 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -710,7 +710,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 */ @@ -1219,6 +1219,7 @@ void clean_up(bool print_message) delete binlog_filter; delete rpl_filter; end_ssl(); + vio_end(); #ifdef USE_REGEX my_regex_end(); #endif |