merge

9d6fb85f · Vladislav Vaintroub · ec2b0749 · 6c4c11b0 · 9d6fb85f
Commit 9d6fb85f authored May 20, 2011 by Vladislav Vaintroub
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

sql/mysql_upgrade_service.cc sql/mysql_upgrade_service.cc +6 -5

No files found.
--- 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}
 };