1 files changed, 5 insertions, 2 deletions
diff --git a/extra/mysql_waitpid.c b/extra/mysql_waitpid.c
index 7777da25aa1..5cdf1dedc27 100644
--- a/extra/mysql_waitpid.c
+++ b/extra/mysql_waitpid.c
@@ -50,10 +50,11 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
   switch(optid) {
   case 'V':
     printf("%s version %s by Jani Tolonen\n", progname, VER);
-    exit(-1);
+    exit(0);
   case 'I':
   case '?':
     usage();
+    exit(0);
   }
   return 0;
 }
@@ -69,7 +70,10 @@ int main(int argc, char *argv[])
     exit(-1);
   if (!argv[0] || !argv[1] || (pid= atoi(argv[0])) <= 0 ||
       (t= atoi(argv[1])) <= 0)
+  {
     usage();
+    exit(-1);
+  }
   for (; t > 0; t--)
   {
     if (kill((pid_t) pid, sig))
@@ -100,5 +104,4 @@ void usage(void)
   printf("integer arguments.\n\n");
   printf("Options:\n");
   my_print_help(my_long_options);
-  exit(-1);
 }