diff options
| author | unknown <jperkin@production.mysql.com> | 2007-07-26 14:27:36 +0200 |
|---|---|---|
| committer | unknown <jperkin@production.mysql.com> | 2007-07-26 14:27:36 +0200 |
| commit | 22141bf5d91499a80b6bc86024aab9ddd5f4ee45 (patch) | |
| tree | 3975f059c65179274676603042a8405830395c71 /scripts/mysql_install_db.sh | |
| parent | 3b8dca23b05e00f8855795ec899b23effe1fd55a (diff) | |
| download | mariadb-git-22141bf5d91499a80b6bc86024aab9ddd5f4ee45.tar.gz | |
Apply a few more cleanups to improve the robustness of mysql_install_db
scripts/mysql_install_db.sh:
Put back variable initialisation for those which could be passed
in via the environment and confuse the script.
Diffstat (limited to 'scripts/mysql_install_db.sh')
| -rw-r--r-- | scripts/mysql_install_db.sh | 17 |
1 files 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 |