diff options
| author | Georg Richter <georg@mariadb.com> | 2018-12-05 17:36:34 +0100 |
|---|---|---|
| committer | Georg Richter <georg@mariadb.com> | 2018-12-05 17:36:34 +0100 |
| commit | fecedb8c92bc93c044e3f8b52a304ad2cb14ecf1 (patch) | |
| tree | f21494319648a00d03ba0c35571a7a57b4197f86 /sql/sys_vars.cc | |
| parent | b8d32f74b22b7e6bb58467300f39c72f0193ee39 (diff) | |
| download | mariadb-git-bb-10.2gr.tar.gz | |
Windows fixesbb-10.2gr
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 4b8e6eca8b8..d1b49c51718 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -3222,14 +3222,7 @@ static Sys_var_set Sys_tls_version( "TLS protocol version for secure connections.", READ_ONLY GLOBAL_VAR(tls_version), CMD_LINE(REQUIRED_ARG), tls_version_names, - DEFAULT(VIO_TLSv1_0 | VIO_TLSv1_1 -#ifdef TLS1_2_VERSION - | VIO_TLSv1_2 -#endif -#ifdef TLS1_3_VERSION - | VIO_TLSv1_3 -#endif - )); + DEFAULT(VIO_TLSv1_0 | VIO_TLSv1_1 | VIO_TLSv1_2 | VIO_TLSv1_3)); static Sys_var_mybool Sys_standard_compliant_cte( "standard_compliant_cte", |