enable --ssl in the server by default

except in bootstrap
MariaDB · Feb 4, 2024 · ea921fd · ea921fd
1 parent 9f93630
commit ea921fd
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
@@ -1478,7 +1478,7 @@ Query_cache query_cache;
 #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,
   *opt_ssl_cipher= NULL, *opt_ssl_key= NULL, *opt_ssl_crl= NULL,
   *opt_ssl_crlpath= NULL, *opt_tls_version= NULL;
@@ -6714,7 +6714,7 @@ struct my_option my_long_options[]=
 #ifdef HAVE_OPENSSL
   {"ssl", 0,
    "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},
 #endif
 #ifdef _WIN32
@@ -8191,6 +8191,7 @@ mysqld_get_one_option(const struct my_option *opt, const char *argument,
     break;
   case OPT_BOOTSTRAP:
     opt_noacl=opt_bootstrap=1;
+    opt_use_ssl= 0;
 #ifdef _WIN32
     {
       /*