bk commit into 5.0 tree (jani:1.1888) BUG#9835

[jani]

Below is the list of changes that have just been committed into a local
5.0 repository of jani. When jani does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1888 05/04/26 14:28:22 jani@stripped +1 -0
  Fixed Bug#9835: mysqld_multi --help won't output help if there are
  parameter problems.

  scripts/mysqld_multi.sh
    1.23 05/04/26 14:28:17 jani@stripped +13 -10
    Fixed Bug#9835: mysqld_multi --help won't output help if there are
    parameter problems.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jani
# Host:	ua141d10.elisa.omakaista.fi
# Root:	/home/my/bk/mysql-5.0

--- 1.22/scripts/mysqld_multi.sh	2005-01-04 20:13:43 +02:00
+++ 1.23/scripts/mysqld_multi.sh	2005-04-26 14:28:17 +03:00
@@ -4,7 +4,7 @@
 use POSIX qw(strftime);
 
 $|=1;
-$VER="2.12";
+$VER="2.13";
 
 $opt_config_file   = undef();
 $opt_example       = 0;
@@ -37,13 +37,13 @@
 
 sub main
 {
-  my ($flag_exit);
+  my $flag_exit= 0;
 
   if (!defined(my_which(my_print_defaults)))
   {
     # We can't throw out yet, since --version, --help, or --example may
     # have been given
-    print "WARNING! my_print_defaults command not found!\n";
+    print "WARNING: my_print_defaults command not found.\n";
     print "Please make sure you have this command available and\n";
     print "in your path. The command is available from the latest\n";
     print "MySQL distribution.\n";
@@ -76,10 +76,14 @@
     chop @defops;
     splice @ARGV, 0, 0, @defops;
   }
-  GetOptions("help","example","version","mysqld=s","mysqladmin=s",
-             "config-file=s","user=s","password=s","log=s","no-log","tcp-ip",
-             "silent","verbose")
-  || die "Wrong option! See $my_progname --help for detailed information!\n";
+  if (!GetOptions("help","example","version","mysqld=s","mysqladmin=s",
+		  "config-file=s","user=s","password=s","log=s","no-log",
+		  "tcp-ip", "silent","verbose"))
+  {
+    $flag_exit= 1;
+  }
+
+  usage() if ($opt_help);
 
   if ($opt_verbose && $opt_silent)
   {
@@ -95,15 +99,14 @@
     exit(0);
   }
   example() if ($opt_example);
-  usage() if ($opt_help);
   if ($flag_exit)
   {
-    print "Error with an option, see $my_progname --help for more info!\n";
+    print "Error with an option, see $my_progname --help for more info.\n";
     exit(1);
   }
   if (!defined(my_which(my_print_defaults)))
   {
-    print "ABORT: Can't find command 'my_print_defaults'!\n";
+    print "ABORT: Can't find command 'my_print_defaults'.\n";
     print "This command is available from the latest MySQL\n";
     print "distribution. Please make sure you have the command\n";
     print "in your PATH.\n";