Add "have_ssl" as synonym for "have_openssl"

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

14 files changed, 25 insertions, 22 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);
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index fb3ac00fd62..fd11f27e159 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -1383,7 +1383,7 @@ extern handlerton myisammrg_hton;
 #define have_merge_db myisammrg_hton.state
 
 extern SHOW_COMP_OPTION have_isam;
-extern SHOW_COMP_OPTION have_raid, have_openssl, have_symlink, have_dlopen;
+extern SHOW_COMP_OPTION have_raid, have_ssl, have_symlink, have_dlopen;
 extern SHOW_COMP_OPTION have_query_cache;
 extern SHOW_COMP_OPTION have_geometry, have_rtree_keys;
 extern SHOW_COMP_OPTION have_crypt;
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index b260394e50d..65630c294d3 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -489,7 +489,7 @@ CHARSET_INFO *national_charset_info, *table_alias_charset;
 CHARSET_INFO *character_set_filesystem;
 
 SHOW_COMP_OPTION have_isam;
-SHOW_COMP_OPTION have_raid, have_openssl, have_symlink, have_query_cache;
+SHOW_COMP_OPTION have_raid, have_ssl, have_symlink, have_query_cache;
 SHOW_COMP_OPTION have_geometry, have_rtree_keys, have_dlopen;
 SHOW_COMP_OPTION have_crypt, have_compress;
 
@@ -3017,12 +3017,12 @@ static void init_ssl()
     if (!ssl_acceptor_fd)
     {
       opt_use_ssl = 0;
-      have_openssl= SHOW_OPTION_DISABLED;
+      have_ssl= SHOW_OPTION_DISABLED;
     }
   }
   else
   {
-    have_openssl= SHOW_OPTION_DISABLED;
+    have_ssl= SHOW_OPTION_DISABLED;
   }
   if (des_key_file)
     load_des_key_file(des_key_file);
@@ -6591,9 +6591,9 @@ static void mysql_init_variables(void)
   have_raid=SHOW_OPTION_NO;
 #endif
 #ifdef HAVE_OPENSSL
-  have_openssl=SHOW_OPTION_YES;
+  have_ssl=SHOW_OPTION_YES;
 #else
-  have_openssl=SHOW_OPTION_NO;
+  have_ssl=SHOW_OPTION_NO;
 #endif
 #ifdef HAVE_BROKEN_REALPATH
   have_symlink=SHOW_OPTION_NO;
diff --git a/sql/set_var.cc b/sql/set_var.cc
index b3a9305132a..67a04775110 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -874,7 +874,9 @@ struct show_var_st init_vars[]= {
   {"have_isam",		      (char*) &have_isam,		    SHOW_HAVE},
   {"have_merge_engine",       (char*) &have_merge_db,               SHOW_HAVE},
   {"have_ndbcluster",         (char*) &have_ndbcluster,             SHOW_HAVE},
-  {"have_openssl",	      (char*) &have_openssl,		    SHOW_HAVE},
+  /* have_openssl is just and alias for have_ssl */
+  {"have_openssl",	      (char*) &have_ssl,		    SHOW_HAVE},
+  {"have_ssl",	              (char*) &have_ssl,		    SHOW_HAVE},
   {"have_query_cache",        (char*) &have_query_cache,            SHOW_HAVE},
   {"have_raid",		      (char*) &have_raid,		    SHOW_HAVE},
   {"have_rtree_keys",         (char*) &have_rtree_keys,             SHOW_HAVE},