bk commit into 5.0 tree (jperkin:1.2479)

[Jonathan Perkin]

Below is the list of changes that have just been committed into a local
5.0 repository of jperkin. When jperkin 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@stripped, 2007-07-26 14:27:36+02:00, jperkin@stripped +1 -0
  Apply a few more cleanups to improve the robustness of mysql_install_db

  scripts/mysql_install_db.sh@stripped, 2007-07-26 14:24:17+02:00, jperkin@stripped +9 -0
    Put back variable initialisation for those which could be passed
    in via the environment and confuse the script.

  scripts/mysql_install_db.sh@stripped, 2007-07-26 14:16:51+02:00, jperkin@stripped +2 -3
    No need for temporary $langdir variable.

  scripts/mysql_install_db.sh@stripped, 2007-07-26 14:05:47+02:00, jperkin@stripped +2 -1
    Indent "for arg do" correctly, both to retain existing style
    used in the rest of the script, and also to provide better
    shell compatability.

diff -Nrup a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
--- a/scripts/mysql_install_db.sh	2007-07-26 12:43:09 +02:00
+++ b/scripts/mysql_install_db.sh	2007-07-26 14:24:17 +02:00
@@ -18,6 +18,15 @@
 #
 # All unrecognized arguments to this script are passed to mysqld.
 
+basedir=""
+ldata=""
+srcdir=""
+
+args=""
+defaults=""
+mysqld_opt=""
+user=""
+
 force=0
 in_rpm=0
 ip_only=0
@@ -87,7 +96,8 @@ parse_arguments()
     shift
   fi
 
-  for arg do
+  for arg
+  do
     case "$arg" in
       --force) force=1 ;;
       --basedir=*) basedir=`parse_arg "$arg"` ;;
@@ -203,11 +213,10 @@ then
   mysqld="./sql/mysqld"
   if test -n "$srcdir" -a -f "$srcdir/sql/share/english/errmsg.sys"
   then
-    langdir="$srcdir/sql/share/english"
+    mysqld_opt="--language=$srcdir/sql/share/english"
   else
-    langdir="./sql/share/english"
+    mysqld_opt="./sql/share/english"
   fi
-  mysqld_opt="--language=$langdir"
 fi
 
 # Make sure mysqld is available in default location (--basedir option is