diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-12-18 11:56:00 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-12-18 11:56:00 +0100 |
| commit | 6a742fc3b12527c5bd4817957de01ce22c0c8bba (patch) | |
| tree | e11dcec52e7babe90067f3eee3bd82b371f35731 /sql | |
| parent | 6c3de76ad5cb8683ab8b049e0bbba670115d304a (diff) | |
| download | mariadb-git-6a742fc3b12527c5bd4817957de01ce22c0c8bba.tar.gz | |
MDEV-3927 Add variable "have yassl"
have_openssl variable was ON even when OpenSSL was not used (but YaSSL was).
fix that, so that have_openssl really corresponds to OpenSSL
rename not_openssl.inc to not_ssl.inc and fix the test accordingly.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 8 | ||||
| -rw-r--r-- | sql/set_var.h | 1 | ||||
| -rw-r--r-- | sql/sys_vars.cc | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index a6547bcc191..6151ec73f79 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -656,6 +656,7 @@ SHOW_COMP_OPTION have_ssl, have_symlink, have_dlopen, have_query_cache; SHOW_COMP_OPTION have_geometry, have_rtree_keys; SHOW_COMP_OPTION have_crypt, have_compress; SHOW_COMP_OPTION have_profiling; +SHOW_COMP_OPTION have_openssl; /* Thread specific variables */ @@ -7366,8 +7367,13 @@ static int mysql_init_variables(void) #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) have_ssl=SHOW_OPTION_YES; +#if HAVE_YASSL + have_openssl= SHOW_OPTION_NO; #else - have_ssl=SHOW_OPTION_NO; + have_openssl= SHOW_OPTION_YES; +#endif +#else + have_openssl= have_ssl= SHOW_OPTION_NO; #endif #ifdef HAVE_BROKEN_REALPATH have_symlink=SHOW_OPTION_NO; diff --git a/sql/set_var.h b/sql/set_var.h index d6dad2132ce..f912c9fffad 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -297,6 +297,7 @@ extern SHOW_COMP_OPTION have_query_cache; extern SHOW_COMP_OPTION have_geometry, have_rtree_keys; extern SHOW_COMP_OPTION have_crypt; extern SHOW_COMP_OPTION have_compress; +extern SHOW_COMP_OPTION have_openssl; /* Prototypes for helper functions diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 9cf2a64a1b8..c67c1178dc8 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -3074,7 +3074,7 @@ static Sys_var_have Sys_have_geometry( static Sys_var_have Sys_have_openssl( "have_openssl", "have_openssl", - READ_ONLY GLOBAL_VAR(have_ssl), NO_CMD_LINE); + READ_ONLY GLOBAL_VAR(have_openssl), NO_CMD_LINE); static Sys_var_have Sys_have_profiling( "have_profiling", "have_profiling", |