diff options
| -rw-r--r-- | sql/mysql_upgrade_service.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/mysql_upgrade_service.cc b/sql/mysql_upgrade_service.cc index 68d97936e7d..db916101eb1 100644 --- a/sql/mysql_upgrade_service.cc +++ b/sql/mysql_upgrade_service.cc @@ -67,6 +67,7 @@ static struct my_option my_long_options[]= NO_ARG, 0, 0, 0, 0, 0, 0}, {"service", 'S', "Name of the existing Windows service", &opt_service, &opt_service, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0} }; @@ -96,7 +97,7 @@ static void log(const char *fmt, ...) va_start(args, fmt); vfprintf(stdout,fmt, args); va_end(args); - fputc('\n', stdout);
+ fputc('\n', stdout); fflush(stdout); } @@ -117,13 +118,13 @@ static void die(const char *fmt, ...) logfile_path); } va_end(args); - fputc('\n', stderr);
+ fputc('\n', stderr); fflush(stdout); /* Cleanup */ - /*
- Stop service that we started, if it was not initally running at
- program start.
+ /* + Stop service that we started, if it was not initally running at + program start. */ if (initial_service_state != -1 && initial_service_state != SERVICE_RUNNING) { |