1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

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.
This commit is contained in:
unknown
2007-07-26 14:27:36 +02:00
parent 17136906c6
commit 82bbaaf6b1

View File

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