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

Yet another SSL fixes

Browse Source
This commit is contained in:
tonu@x153.internalnet
2001-09-01 06:57:08 +08:00
parent 9cd207e0ca
commit 6e490cb713
7 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/include/have_openssl_1.inc Normal file
View File

@ -0,0 +1,2 @@
-- require r/have_openssl_1.require
show variables like "have_openssl";

2
mysql-test/include/have_openssl_2.inc Normal file
View File

@ -0,0 +1,2 @@
-- require r/have_openssl_2.require
SHOW STATUS LIKE "SSL_get_cipher";

2
mysql-test/r/have_openssl_1.require Normal file
View File

@ -0,0 +1,2 @@
Variable_name Value
have_openssl YES

2
mysql-test/r/have_openssl_2.require Normal file
View File

@ -0,0 +1,2 @@
Variable_name Value
jkhjkhfs

1
mysql-test/t/openssl_1.test
View File

@ -1,5 +1,6 @@
# We test openssl. Result set is optimized to be compiled with --with-openssl but # We test openssl. Result set is optimized to be compiled with --with-openssl but
# SSL is swithced off in some reason # SSL is swithced off in some reason
-- source include/have_openssl_2.inc
SHOW STATUS LIKE 'SSL%'; SHOW STATUS LIKE 'SSL%';

2
mysql-test/t/openssl_2.test
View File

@ -1,5 +1,5 @@
# We want to test everything with SSL turned on. # We want to test everything with SSL turned on.
-- source include/have_openssl.inc -- source include/have_openssl_2.inc
SHOW STATUS LIKE 'SSL%'; SHOW STATUS LIKE 'SSL%';

2
sql/mysqld.cc
View File

@ -1991,7 +1991,7 @@ The server will not act as a slave.");
if(hEventShutdown) CloseHandle(hEventShutdown); if(hEventShutdown) CloseHandle(hEventShutdown);
} }
#endif #endif
my_free((gptr)ssl_acceptor_fd,MYF(0));
/* Wait until cleanup is done */ /* Wait until cleanup is done */
(void) pthread_mutex_lock(&LOCK_thread_count); (void) pthread_mutex_lock(&LOCK_thread_count);
while (!ready_to_exit) while (!ready_to_exit)