bk commit into 5.0 tree (holyfoot:1.2062)

[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.2062 06/02/20 14:26:32 holyfoot@deer.(none) +1 -0
  Messgges corrected in mysql_upgrade script

  scripts/mysql_upgrade.sh
    1.3 06/02/20 14:26:26 holyfoot@stripped +5 -5
    messages corrected

# 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.2/scripts/mysql_upgrade.sh	Sat Feb 18 14:55:26 2006
+++ 1.3/scripts/mysql_upgrade.sh	Mon Feb 20 14:26:26 2006
@@ -95,12 +95,12 @@
   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 "  --basedir  Specifies the directory where MySQL is installed"
+  echo "  --datadir  Specifies the data directory"
+  echo "  --force    Mysql_upgrade.info file will be ignored"
+  echo "  --user     Username for server login if not current user"
+  echo "  --verbose  Display more output about the process"
   echo ""
 
   exit 0