Commit d8ab6109 authored by Georg Richter's avatar Georg Richter

MDEV-14101: Test fix (don't display tls_version in server variables test,...

MDEV-14101: Test fix (don't display tls_version in server variables test, since output might differ depending on configuration).
parent 1a0c9c41
...@@ -29,6 +29,7 @@ select * from information_schema.system_variables ...@@ -29,6 +29,7 @@ select * from information_schema.system_variables
'rand_seed1', 'rand_seed1',
'rand_seed2', 'rand_seed2',
'system_time_zone', 'system_time_zone',
'tls_version',
'version_comment', 'version_comment',
'version_compile_machine', 'version_compile_os', 'version_compile_machine', 'version_compile_os',
'version_malloc_library', 'version_ssl_library', 'version' 'version_malloc_library', 'version_ssl_library', 'version'
......
...@@ -18,6 +18,7 @@ variable_name not in ( ...@@ -18,6 +18,7 @@ variable_name not in (
'rand_seed1', 'rand_seed1',
'rand_seed2', 'rand_seed2',
'system_time_zone', 'system_time_zone',
'tls_version',
'version_comment', 'version_comment',
'version_compile_machine', 'version_compile_os', 'version_compile_machine', 'version_compile_os',
'version_malloc_library', 'version_ssl_library', 'version' 'version_malloc_library', 'version_ssl_library', 'version'
......
...@@ -1505,7 +1505,7 @@ my_bool opt_use_ssl = 0; ...@@ -1505,7 +1505,7 @@ my_bool opt_use_ssl = 0;
char *opt_ssl_ca= NULL, *opt_ssl_capath= NULL, *opt_ssl_cert= NULL, char *opt_ssl_ca= NULL, *opt_ssl_capath= NULL, *opt_ssl_cert= NULL,
*opt_ssl_cipher= NULL, *opt_ssl_key= NULL, *opt_ssl_crl= NULL, *opt_ssl_cipher= NULL, *opt_ssl_key= NULL, *opt_ssl_crl= NULL,
*opt_ssl_crlpath= NULL, *opt_tls_version= NULL; *opt_ssl_crlpath= NULL, *opt_tls_version= NULL;
long tls_version= 0; ulonglong tls_version= 0;
static scheduler_functions thread_scheduler_struct, extra_thread_scheduler_struct; static scheduler_functions thread_scheduler_struct, extra_thread_scheduler_struct;
scheduler_functions *thread_scheduler= &thread_scheduler_struct, scheduler_functions *thread_scheduler= &thread_scheduler_struct,
......
...@@ -588,7 +588,7 @@ extern int32 thread_count, service_thread_count; ...@@ -588,7 +588,7 @@ extern int32 thread_count, service_thread_count;
extern char *opt_ssl_ca, *opt_ssl_capath, *opt_ssl_cert, *opt_ssl_cipher, extern char *opt_ssl_ca, *opt_ssl_capath, *opt_ssl_cert, *opt_ssl_cipher,
*opt_ssl_key, *opt_ssl_crl, *opt_ssl_crlpath; *opt_ssl_key, *opt_ssl_crl, *opt_ssl_crlpath;
extern long tls_version; extern ulonglong tls_version;
extern MYSQL_PLUGIN_IMPORT pthread_key(THD*, THR_THD); extern MYSQL_PLUGIN_IMPORT pthread_key(THD*, THR_THD);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment