From 2c95b977874d232cc0fc935d5ac0e0c85a5db682 Mon Sep 17 00:00:00 2001
From: "jperkin@production.mysql.com" <>
Date: Thu, 26 Jul 2007 14:27:36 +0200
Subject: [PATCH] Apply a few more cleanups to improve the robustness of
 mysql_install_db

---
 scripts/mysql_install_db.sh | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index c5d532ee4ed..760ece5aaed 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -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