diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-06-01 17:31:39 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-06-01 17:31:39 +0200 |
| commit | 78c10ccad8b913f91831c3cd8cb62e5930943556 (patch) | |
| tree | 313fba31b9539ba6f521803e32b739f1e8d6314d /sql/sys_vars.cc | |
| parent | 9c41b35b6aa7eba86273f8634dd6d633b140211e (diff) | |
| download | mariadb-git-78c10ccad8b913f91831c3cd8cb62e5930943556.tar.gz | |
MDEV-7913 main.openssl_6975 'tlsv10' fails in buildbot on Wheezy and Precise
version_ssl_library should show the version
of openssl library that is being used, not the one
that server was compiled with.
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index aecca64842f..2ad417872bf 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -3386,8 +3386,8 @@ static Sys_var_charptr Sys_malloc_library( #include <openssl/ssl.h> #define SSL_LIBRARY "YaSSL " YASSL_VERSION #elif HAVE_OPENSSL -#include <openssl/opensslv.h> -#define SSL_LIBRARY OPENSSL_VERSION_TEXT +#include <openssl/crypto.h> +#define SSL_LIBRARY SSLeay_version(SSLEAY_VERSION) #else #error No SSL? #endif |