Commit ea921fd8 authored by Sergei Golubchik's avatar Sergei Golubchik

enable --ssl in the server by default

except in bootstrap
parent 9f93630d
...@@ -1478,7 +1478,7 @@ Query_cache query_cache; ...@@ -1478,7 +1478,7 @@ Query_cache query_cache;
#endif #endif
my_bool opt_use_ssl = 0; my_bool opt_use_ssl = 1;
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;
...@@ -6714,7 +6714,7 @@ struct my_option my_long_options[]= ...@@ -6714,7 +6714,7 @@ struct my_option my_long_options[]=
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
{"ssl", 0, {"ssl", 0,
"Enable SSL for connection (automatically enabled if an ssl option is used).", "Enable SSL for connection (automatically enabled if an ssl option is used).",
&opt_use_ssl, &opt_use_ssl, 0, GET_BOOL, OPT_ARG, 0, 0, 0, &opt_use_ssl, &opt_use_ssl, 0, GET_BOOL, OPT_ARG, 1, 0, 0,
0, 0, 0}, 0, 0, 0},
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
...@@ -8191,6 +8191,7 @@ mysqld_get_one_option(const struct my_option *opt, const char *argument, ...@@ -8191,6 +8191,7 @@ mysqld_get_one_option(const struct my_option *opt, const char *argument,
break; break;
case OPT_BOOTSTRAP: case OPT_BOOTSTRAP:
opt_noacl=opt_bootstrap=1; opt_noacl=opt_bootstrap=1;
opt_use_ssl= 0;
#ifdef _WIN32 #ifdef _WIN32
{ {
/* /*
......
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