Commit 8c03a589 authored by unknown's avatar unknown

Yet another SSL fixes


mysql-test/t/openssl_1.test:
  SSL fix
mysql-test/t/openssl_2.test:
  SSL fix
sql/mysqld.cc:
  C
parent bf10717a
-- require r/have_openssl_1.require
show variables like "have_openssl";
-- require r/have_openssl_2.require
SHOW STATUS LIKE "SSL_get_cipher";
Variable_name Value
have_openssl YES
Variable_name Value
jkhjkhfs
# We test openssl. Result set is optimized to be compiled with --with-openssl but
# SSL is swithced off in some reason
-- source include/have_openssl_2.inc
SHOW STATUS LIKE 'SSL%';
# We want to test everything with SSL turned on.
-- source include/have_openssl.inc
-- source include/have_openssl_2.inc
SHOW STATUS LIKE 'SSL%';
......@@ -1991,7 +1991,7 @@ The server will not act as a slave.");
if(hEventShutdown) CloseHandle(hEventShutdown);
}
#endif
my_free((gptr)ssl_acceptor_fd,MYF(0));
/* Wait until cleanup is done */
(void) pthread_mutex_lock(&LOCK_thread_count);
while (!ready_to_exit)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment