Bug#32525651: MYSQL_MIGRATE_KEYRING OPTION-HANDLING ISSUES

Description: When mysql_migrate_keyring is executed with --help
             option, it should not check validity of parameters
             which are mandatory for migration.

RB: 26004

Author: harinvadodaria

client/migrate_keyring/migrate_keyring.cc

@@ -79,7 +79,7 @@ int main(int argc, char **argv) {
 
   int exit_code;
   if (process_options(&argc, &argv, exit_code) == false) {
-    return exit_status;
+    return exit_code;
   }
 
   {
@@ -136,5 +136,5 @@ int main(int argc, char **argv) {
     }
     log_info << "Key migration successful." << std::endl;
   }
-  return 0;
+  return EXIT_SUCCESS;
 }

client/migrate_keyring/options.cc

@@ -70,6 +70,7 @@ enum migration_options {
   OPT_LAST
 };
 
+bool Options::s_help = false;
 bool Options::s_verbose = false;
 char *Options::s_component_dir = nullptr;
 char *Options::s_source_keyring = nullptr;
@@ -173,11 +174,13 @@ static void usage(bool version_only) {
 bool get_one_option(int optid, const struct my_option *opt, char *argument) {
   switch (optid) {
     case 'V':
+      Options::s_help = true;
       usage(true);
       break;
     case 'I':
       // Fall through
     case '?':
+      Options::s_help = true;
       usage(false);
       break;
     case 'v':
@@ -229,6 +232,11 @@ static bool get_options(int argc, char **argv, int &exit_code) {
     return false;
   }
 
+  if (Options::s_help == true) {
+    exit_code = EXIT_SUCCESS;
+    return false;
+  }
+
   if (check_options_for_sanity() == false) return false;
 
   if (Options::s_tty_password) Options::s_password = get_tty_password(NullS);

client/migrate_keyring/options.h

@@ -35,6 +35,8 @@ namespace options {
 
 class Options {
  public:
+  /** Help */
+  static bool s_help;
   /** Be loud */
   static bool s_verbose;
   /** Component directory location */