merge 43005

mysql-test/lib/My/SafeProcess/safe_process_win.cc

@@ -186,13 +186,19 @@ int main(int argc, const char** argv )
         die("No real args -> nothing to do");
       /* Copy the remaining args to child_arg */
       for (int j= i+1; j < argc; j++) {
-	if (strchr (argv[j], ' ')) {
-	  /* Protect with "" if this arg contains a space */
+        arg= argv[j];
+        if (strchr (arg, ' ') &&
+            arg[0] != '\"' &&
+            arg[strlen(arg)] != '\"')
+        {
+          /* Quote arg that contains spaces and are not quoted already */
           to+= _snprintf(to, child_args + sizeof(child_args) - to,
-                         "\"%s\" ", argv[j]);
-	} else {
+                         "\"%s\" ", arg);
+        }
+        else
+        {
           to+= _snprintf(to, child_args + sizeof(child_args) - to,
-	                 "%s ", argv[j]);
+          "%s ", arg);
         }
       }
       break;