Merge branch 'mysql-8.0' into mysql-trunk

Author: jensevenb

sql/mysqld.cc

@@ -6720,6 +6720,24 @@ int mysqld_main(int argc, char **argv) {
   // Set windows_service value in mysqld
   if (!mysqld_monitor) {
     windows_service = is_monitor_win_service();
+
+    if (windows_service) {
+      if (argc == 2 && Service.IsService(argv[1])) {
+        if (my_strcasecmp(system_charset_info, argv[1], "mysql"))
+          load_default_groups[load_default_groups_sz - 2] = argv[1];
+        argc--;
+
+      } else if (argc == 3 && Service.IsService(argv[2])) {
+        /*
+        mysqld was started as
+        mysqld --defaults-file=my_path\my.ini service-name
+        */
+        if (my_strcasecmp(system_charset_info, argv[2], "mysql"))
+          load_default_groups[load_default_groups_sz - 2] = argv[2];
+        argc--;
+      }
+    }
+
     my_global_argc = argc;
     my_global_argv = argv;
   } else {

sql/restart_monitor_win.cc

@@ -695,9 +695,6 @@ int start_monitor() {
     std::string arg;
     arg.resize(wcslen(argv_tmp[i]));  // Do not copy null
     wcstombs(&arg[0], argv_tmp[i], arg.size());
-    if ((i == 2 || i == 1) && get_win_service_ptr()->IsService(arg.c_str()))
-      break;
-
     argv_vec.push_back(arg);
   }
   LocalFree(argv_tmp);