Apply a few more cleanups to improve the robustness of mysql_install_db
This commit is contained in:
parent
8f87bd6008
commit
2c95b97787
@ -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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user