Add "have_ssl" as synonym for "have_openssl"

mysql-test/t/openssl_1.test:
  Add "have_ssl" as synonym for "have_openssl"
  Correct comment

11 files changed, 16 insertions, 15 deletions

diff --git a/mysql-test/include/have_openssl.inc b/mysql-test/include/have_openssl.inc
deleted file mode 100644
index 54c5b04b3e4..00000000000
--- a/mysql-test/include/have_openssl.inc
+++ /dev/null
@@ -1,4 +0,0 @@
--- require r/have_openssl.require
-disable_query_log;
-show variables like "have_openssl";
-enable_query_log;
diff --git a/mysql-test/include/have_ssl.inc b/mysql-test/include/have_ssl.inc
new file mode 100644
index 00000000000..fab57d630e5
--- /dev/null
+++ b/mysql-test/include/have_ssl.inc
@@ -0,0 +1,4 @@
+-- require r/have_ssl.require
+disable_query_log;
+show variables like "have_ssl";
+enable_query_log;
diff --git a/mysql-test/r/have_openssl.require b/mysql-test/r/have_ssl.require
index dae48a472b5..9bdffdf0c13 100644
--- a/mysql-test/r/have_openssl.require
+++ b/mysql-test/r/have_ssl.require
@@ -1,2 +1,2 @@
 Variable_name	Value
-have_openssl	YES
+have_ssl	YES
diff --git a/mysql-test/t/func_des_encrypt.test b/mysql-test/t/func_des_encrypt.test
index 5d102bd02eb..b757a632adf 100644
--- a/mysql-test/t/func_des_encrypt.test
+++ b/mysql-test/t/func_des_encrypt.test
@@ -1,4 +1,4 @@
--- source include/have_openssl.inc
+-- source include/have_ssl.inc
 
 # This test can't be in func_encrypt.test, because it requires
 # --des-key-file to not be set.
diff --git a/mysql-test/t/func_encrypt.test b/mysql-test/t/func_encrypt.test
index a7364fa43da..bcf1e5a77f4 100644
--- a/mysql-test/t/func_encrypt.test
+++ b/mysql-test/t/func_encrypt.test
@@ -1,4 +1,4 @@
--- source include/have_openssl.inc
+-- source include/have_ssl.inc
 
 --disable_warnings
 drop table if exists t1;
diff --git a/mysql-test/t/openssl_1.test b/mysql-test/t/openssl_1.test
index 3d614514de3..8772b8157e3 100644
--- a/mysql-test/t/openssl_1.test
+++ b/mysql-test/t/openssl_1.test
@@ -1,6 +1,7 @@
-# We test openssl. Result set is optimized to be compiled with --with-openssl.
-# Use mysql-test-run with --with-openssl option.
--- source include/have_openssl.inc
+# Tests for SSL connections, only run if mysqld is compiled
+# with support for SSL.
+
+-- source include/have_ssl.inc
 
 --disable_warnings
 drop table if exists t1;
diff --git a/mysql-test/t/rpl_openssl.test b/mysql-test/t/rpl_openssl.test
index 7d769ad448e..085620a9692 100644
--- a/mysql-test/t/rpl_openssl.test
+++ b/mysql-test/t/rpl_openssl.test
@@ -1,4 +1,4 @@
-source include/have_openssl.inc;
+source include/have_ssl.inc;
 source include/master-slave.inc;
 
 # We don't test all types of ssl auth params here since it's a bit hard 
diff --git a/mysql-test/t/ssl.test b/mysql-test/t/ssl.test
index de88569d74a..a15f0212fbd 100644
--- a/mysql-test/t/ssl.test
+++ b/mysql-test/t/ssl.test
@@ -1,7 +1,7 @@
 # Turn on ssl between the client and server
 # and run a number of tests
 
--- source include/have_openssl.inc
+-- source include/have_ssl.inc
 
 connect (ssl_con,localhost,root,,,,,SSL);
 
diff --git a/mysql-test/t/ssl_compress.test b/mysql-test/t/ssl_compress.test
index f5fe86e9a81..23051c0e367 100644
--- a/mysql-test/t/ssl_compress.test
+++ b/mysql-test/t/ssl_compress.test
@@ -1,7 +1,7 @@
 # Turn on compression between the client and server
 # and run a number of tests
 
--- source include/have_openssl.inc
+-- source include/have_ssl.inc
 -- source include/have_compress.inc
 
 connect (ssl_compress_con,localhost,root,,,,,SSL COMPRESS);
diff --git a/mysql-test/t/ssl_connect.test b/mysql-test/t/ssl_connect.test
index 99c875186c1..31e581c9342 100644
--- a/mysql-test/t/ssl_connect.test
+++ b/mysql-test/t/ssl_connect.test
@@ -1,5 +1,5 @@
 
--- source include/have_openssl.inc
+-- source include/have_ssl.inc
 
 # Repeat connect/disconnect
 
diff --git a/mysql-test/t/ssl_des.test b/mysql-test/t/ssl_des.test
index 7cf2c920ab5..7e4efe40add 100644
--- a/mysql-test/t/ssl_des.test
+++ b/mysql-test/t/ssl_des.test
@@ -2,7 +2,7 @@
 # then turn on ssl between the client and server
 # and run a number of standard tests
 
--- source include/have_openssl.inc
+-- source include/have_ssl.inc
 
 # Connect by ip to avoid turning on "ssl-verify-server-cert"
 connect (ssl_con,127.0.0.1,root,,,,$MASTER_MYPORT,SSL);