summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authormsvensson@pilot.blaudden <>2007-03-05 10:03:42 +0100
committermsvensson@pilot.blaudden <>2007-03-05 10:03:42 +0100
commit9a2eea4019cdc318efd3391ca948986720cadfa8 (patch)
tree136e9ed8fb8afbf1de870f1389c9a16a9130cceb /sql/mysqld.cc
parentab61d07a30b73e3446b6eab9536ba464a0d55f74 (diff)
downloadmariadb-git-9a2eea4019cdc318efd3391ca948986720cadfa8.tar.gz
Add "have_ssl" as synonym for "have_openssl"
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc10
1 files changed, 5 insertions, 5 deletions
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;