bk commit into 5.0 tree (holyfoot:1.2061)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.0 repository of hf. When hf 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.2061 06/02/18 14:55:31 holyfoot@deer.(none) +1 -0
  --help option added to mysql_upgrade script

  scripts/mysql_upgrade.sh
    1.2 06/02/18 14:55:26 holyfoot@stripped +18 -0
    --help option implemented

# 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:	holyfoot
# Host:	deer.(none)
# Root:	/home/hf/work/mysql-5.0.w2645

--- 1.1/scripts/mysql_upgrade.sh	Fri Feb 17 10:51:11 2006
+++ 1.2/scripts/mysql_upgrade.sh	Sat Feb 18 14:55:26 2006
@@ -39,6 +39,7 @@
       --ldata=*|--data=*|--datadir=*) DATADIR=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
       --force) force=1 ;;
       --verbose) verbose=1 ;;
+      --help) help_option=1 ;;
       *)
         if test -n "$pick_args"
         then
@@ -84,9 +85,26 @@
 MY_BASEDIR_VERSION=
 verbose=0
 force=0
+help_option=0
 
 parse_arguments `$print_defaults $defaults mysqld mysql_upgrade`
 parse_arguments PICK-ARGS-FROM-ARGV "$@"
+
+if test $help_option = 1
+then
+  echo "MySQL utility script to upgrade database to the current server version"
+  echo ""
+  echo "It takes the following arguments:"
+  echo "  --basedir  Specifies the directory where MySQL is installed"
+  echo "  --user     user for database login if not current user"
+  echo "  --datadir  data directory"
+  echo "  --force    keep process ignoring errors"
+  echo "  --verbose  give more output about the process"
+  echo "  --help     Show this help message"
+  echo ""
+
+  exit 0
+fi
 
 #
 # Try to find where binaries are installed