database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

new read-only server variable version_ssl_library

Browse Source
This commit is contained in:
Sergei Golubchik
2015-01-09 14:00:00 +01:00
parent 0d676fa0b7
commit 83c0866082
7 changed files with 51 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite.pm
View File

@ -63,7 +63,8 @@ sub skip_combinations {
$skip{'include/check_ipv6.inc'} = 'No IPv6' unless ipv6_ok(); $skip{'include/check_ipv6.inc'} = 'No IPv6' unless ipv6_ok();
$skip{'t/openssl_6975.test'} = 'no or too old openssl' $skip{'t/openssl_6975.test'} = 'no or too old openssl'
unless ! IS_WINDOWS and ! system "openssl ciphers TLSv1.2 >/dev/null 2>&1"; unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/
and $1 ge "1.0.1";
%skip; %skip;
} }

6
mysql-test/suite/sys_vars/inc/sysvars_server.inc
View File

@ -21,14 +21,14 @@ select * from information_schema.system_variables
'have_openssl', 'have_openssl',
'have_symlink', 'have_symlink',
'hostname', 'hostname',
'large_files_support', 'large_files_support', 'log_tc_size',
'lower_case_file_system', 'lower_case_file_system',
'lower_case_table_names', 'lower_case_table_names',
'open_files_limit', 'open_files_limit',
'system_time_zone', 'system_time_zone',
'version_comment', 'version_comment',
'version_compile_machine', 'version_compile_os', 'version_compile_machine', 'version_compile_os',
'version_malloc_library', 'log_tc_size', 'version' 'version_malloc_library', 'version_ssl_library', 'version'
) )
order by variable_name; order by variable_name;
@ -49,7 +49,7 @@ select VARIABLE_NAME, VARIABLE_SCOPE, VARIABLE_TYPE, VARIABLE_COMMENT,
'system_time_zone', 'system_time_zone',
'version_comment', 'version_comment',
'version_compile_machine', 'version_compile_os', 'version_compile_machine', 'version_compile_os',
'version_malloc_library', 'version' 'version_malloc_library', 'version_ssl_library', 'version'
) )
order by variable_name; order by variable_name;

16
mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
View File

@ -11,14 +11,14 @@ variable_name not in (
'have_openssl', 'have_openssl',
'have_symlink', 'have_symlink',
'hostname', 'hostname',
'large_files_support', 'large_files_support', 'log_tc_size',
'lower_case_file_system', 'lower_case_file_system',
'lower_case_table_names', 'lower_case_table_names',
'open_files_limit', 'open_files_limit',
'system_time_zone', 'system_time_zone',
'version_comment', 'version_comment',
'version_compile_machine', 'version_compile_os', 'version_compile_machine', 'version_compile_os',
'version_malloc_library', 'log_tc_size', 'version' 'version_malloc_library', 'version_ssl_library', 'version'
) )
order by variable_name; order by variable_name;
VARIABLE_NAME AUTOCOMMIT VARIABLE_NAME AUTOCOMMIT
@ -4026,7 +4026,7 @@ where variable_name in (
'system_time_zone', 'system_time_zone',
'version_comment', 'version_comment',
'version_compile_machine', 'version_compile_os', 'version_compile_machine', 'version_compile_os',
'version_malloc_library', 'version' 'version_malloc_library', 'version_ssl_library', 'version'
) )
order by variable_name; order by variable_name;
VARIABLE_NAME HAVE_OPENSSL VARIABLE_NAME HAVE_OPENSSL
@ -4159,6 +4159,16 @@ NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL ENUM_VALUE_LIST NULL
READ_ONLY YES READ_ONLY YES
COMMAND_LINE_ARGUMENT NULL COMMAND_LINE_ARGUMENT NULL
VARIABLE_NAME VERSION_SSL_LIBRARY
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_COMMENT Version of the used SSL library
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL
READ_ONLY YES
COMMAND_LINE_ARGUMENT NULL
select VARIABLE_NAME, GLOBAL_VALUE_ORIGIN, VARIABLE_SCOPE, VARIABLE_TYPE, select VARIABLE_NAME, GLOBAL_VALUE_ORIGIN, VARIABLE_SCOPE, VARIABLE_TYPE,
VARIABLE_COMMENT, ENUM_VALUE_LIST, READ_ONLY, COMMAND_LINE_ARGUMENT VARIABLE_COMMENT, ENUM_VALUE_LIST, READ_ONLY, COMMAND_LINE_ARGUMENT
from information_schema.system_variables from information_schema.system_variables

16
mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
View File

@ -11,14 +11,14 @@ variable_name not in (
'have_openssl', 'have_openssl',
'have_symlink', 'have_symlink',
'hostname', 'hostname',
'large_files_support', 'large_files_support', 'log_tc_size',
'lower_case_file_system', 'lower_case_file_system',
'lower_case_table_names', 'lower_case_table_names',
'open_files_limit', 'open_files_limit',
'system_time_zone', 'system_time_zone',
'version_comment', 'version_comment',
'version_compile_machine', 'version_compile_os', 'version_compile_machine', 'version_compile_os',
'version_malloc_library', 'log_tc_size', 'version' 'version_malloc_library', 'version_ssl_library', 'version'
) )
order by variable_name; order by variable_name;
VARIABLE_NAME AUTOCOMMIT VARIABLE_NAME AUTOCOMMIT
@ -4754,7 +4754,7 @@ where variable_name in (
'system_time_zone', 'system_time_zone',
'version_comment', 'version_comment',
'version_compile_machine', 'version_compile_os', 'version_compile_machine', 'version_compile_os',
'version_malloc_library', 'version' 'version_malloc_library', 'version_ssl_library', 'version'
) )
order by variable_name; order by variable_name;
VARIABLE_NAME HAVE_OPENSSL VARIABLE_NAME HAVE_OPENSSL
@ -4887,6 +4887,16 @@ NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL ENUM_VALUE_LIST NULL
READ_ONLY YES READ_ONLY YES
COMMAND_LINE_ARGUMENT NULL COMMAND_LINE_ARGUMENT NULL
VARIABLE_NAME VERSION_SSL_LIBRARY
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE VARCHAR
VARIABLE_COMMENT Version of the used SSL library
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL
READ_ONLY YES
COMMAND_LINE_ARGUMENT NULL
select VARIABLE_NAME, GLOBAL_VALUE_ORIGIN, VARIABLE_SCOPE, VARIABLE_TYPE, select VARIABLE_NAME, GLOBAL_VALUE_ORIGIN, VARIABLE_SCOPE, VARIABLE_TYPE,
VARIABLE_COMMENT, ENUM_VALUE_LIST, READ_ONLY, COMMAND_LINE_ARGUMENT VARIABLE_COMMENT, ENUM_VALUE_LIST, READ_ONLY, COMMAND_LINE_ARGUMENT
from information_schema.system_variables from information_schema.system_variables

2
mysql-test/suite/sys_vars/r/version_ssl_library_basic.result Normal file
View File

@ -0,0 +1,2 @@
set @@global.version_malloc_library=1;
ERROR HY000: Variable 'version_malloc_library' is a read only variable

2
mysql-test/suite/sys_vars/t/version_ssl_library_basic.test Normal file
View File

@ -0,0 +1,2 @@
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
set @@global.version_malloc_library=1;

16
sql/sys_vars.cc
View File

@ -3377,6 +3377,22 @@ static Sys_var_charptr Sys_malloc_library(
READ_ONLY GLOBAL_VAR(malloc_library), CMD_LINE_HELP_ONLY, READ_ONLY GLOBAL_VAR(malloc_library), CMD_LINE_HELP_ONLY,
IN_SYSTEM_CHARSET, DEFAULT(MALLOC_LIBRARY)); IN_SYSTEM_CHARSET, DEFAULT(MALLOC_LIBRARY));
#ifdef HAVE_YASSL
#include <openssl/ssl.h>
#define SSL_LIBRARY "YaSSL " YASSL_VERSION
#elif HAVE_OPENSSL
#include <openssl/opensslv.h>
#define SSL_LIBRARY OPENSSL_VERSION_TEXT
#else
#error No SSL?
#endif
static char *ssl_library;
static Sys_var_charptr Sys_ssl_library(
"version_ssl_library", "Version of the used SSL library",
READ_ONLY GLOBAL_VAR(ssl_library), CMD_LINE_HELP_ONLY,
IN_SYSTEM_CHARSET, DEFAULT(SSL_LIBRARY));
static Sys_var_ulong Sys_net_wait_timeout( static Sys_var_ulong Sys_net_wait_timeout(
"wait_timeout", "wait_timeout",
"The number of seconds the server waits for activity on a " "The number of seconds the server waits for activity on a "