From 6e490cb7135c248b90b9792f085c93285704257e Mon Sep 17 00:00:00 2001
From: "tonu@x153.internalnet" <>
Date: Sat, 1 Sep 2001 06:57:08 +0800
Subject: [PATCH] Yet another SSL fixes

---
 mysql-test/include/have_openssl_1.inc | 2 ++
 mysql-test/include/have_openssl_2.inc | 2 ++
 mysql-test/r/have_openssl_1.require   | 2 ++
 mysql-test/r/have_openssl_2.require   | 2 ++
 mysql-test/t/openssl_1.test           | 1 +
 mysql-test/t/openssl_2.test           | 2 +-
 sql/mysqld.cc                         | 2 +-
 7 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 mysql-test/include/have_openssl_1.inc
 create mode 100644 mysql-test/include/have_openssl_2.inc
 create mode 100644 mysql-test/r/have_openssl_1.require
 create mode 100644 mysql-test/r/have_openssl_2.require

diff --git a/mysql-test/include/have_openssl_1.inc b/mysql-test/include/have_openssl_1.inc
new file mode 100644
index 00000000000..5aa93b688f3
--- /dev/null
+++ b/mysql-test/include/have_openssl_1.inc
@@ -0,0 +1,2 @@
+-- require r/have_openssl_1.require
+show variables like "have_openssl";
diff --git a/mysql-test/include/have_openssl_2.inc b/mysql-test/include/have_openssl_2.inc
new file mode 100644
index 00000000000..b15af43715b
--- /dev/null
+++ b/mysql-test/include/have_openssl_2.inc
@@ -0,0 +1,2 @@
+-- require r/have_openssl_2.require
+SHOW STATUS LIKE "SSL_get_cipher";
diff --git a/mysql-test/r/have_openssl_1.require b/mysql-test/r/have_openssl_1.require
new file mode 100644
index 00000000000..dae48a472b5
--- /dev/null
+++ b/mysql-test/r/have_openssl_1.require
@@ -0,0 +1,2 @@
+Variable_name	Value
+have_openssl	YES
diff --git a/mysql-test/r/have_openssl_2.require b/mysql-test/r/have_openssl_2.require
new file mode 100644
index 00000000000..09a65d7d9bc
--- /dev/null
+++ b/mysql-test/r/have_openssl_2.require
@@ -0,0 +1,2 @@
+Variable_name	Value
+jkhjkhfs
diff --git a/mysql-test/t/openssl_1.test b/mysql-test/t/openssl_1.test
index da87604f45a..8dfd0d8c2f9 100644
--- a/mysql-test/t/openssl_1.test
+++ b/mysql-test/t/openssl_1.test
@@ -1,5 +1,6 @@
 # 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%';
 
diff --git a/mysql-test/t/openssl_2.test b/mysql-test/t/openssl_2.test
index 3bdf619890f..12f1240f3af 100644
--- a/mysql-test/t/openssl_2.test
+++ b/mysql-test/t/openssl_2.test
@@ -1,5 +1,5 @@
 # We want to test everything with SSL turned on. 
--- source include/have_openssl.inc 
+-- source include/have_openssl_2.inc 
 
 SHOW STATUS LIKE 'SSL%';
 
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 3448fea55f8..8f91cbc70b1 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -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)