1 files changed, 3 insertions, 9 deletions
diff --git a/mysys/my_default.c b/mysys/my_default.c
index 5db1c44f6f2..ff87eb0a0f3 100644
--- a/mysys/my_default.c
+++ b/mysys/my_default.c
@@ -112,15 +112,9 @@ static my_bool find_wsrep_new_cluster (int* argc, char* argv[])
     {
       ret= TRUE;
       *argc -= 1;
-      if (*argc == i)
-      { // last argument, just zero it up
-        argv[i]= NULL;
-      }
-      else
-      { // not the last argument, copy the last one over and zero that up.
-        argv[i]= argv[*argc];
-        argv[*argc]= NULL;
-      }
+      /* preserve the order of remaining arguments */
+      memmove(&argv[i], &argv[i + 1], (*argc - i)*sizeof(argv[i]));
+      argv[*argc]= NULL;
     }
   }