Commit 580ca2ad authored by unknown's avatar unknown

Merge bk-internal:/home/bk/mysql-4.0/

into serg.mylan:/usr/home/serg/Abk/mysql-4.0

parents c9691ab7 cb12a8b8
...@@ -46,8 +46,9 @@ parse_arguments() { ...@@ -46,8 +46,9 @@ parse_arguments() {
--user=*) --user=*)
if test $SET_USER -eq 0 if test $SET_USER -eq 0
then then
user=`echo "$arg" | sed -e "s;--[^=]*=;;"` ; SET_USER=1 user=`echo "$arg" | sed -e "s;--[^=]*=;;"`
fi fi
SET_USER=1
;; ;;
# these two might have been set in a [mysqld_safe] section of my.cnf # these two might have been set in a [mysqld_safe] section of my.cnf
...@@ -129,7 +130,6 @@ fi ...@@ -129,7 +130,6 @@ fi
# these rely on $DATADIR by default, so we'll set them later on # these rely on $DATADIR by default, so we'll set them later on
pid_file= pid_file=
err_log= err_log=
SET_USER=0
# Get first arguments from the my.cnf file, groups [mysqld] and [mysqld_safe] # Get first arguments from the my.cnf file, groups [mysqld] and [mysqld_safe]
# and then merge with the command line arguments # and then merge with the command line arguments
...@@ -147,7 +147,13 @@ else ...@@ -147,7 +147,13 @@ else
fi fi
args= args=
parse_arguments `$print_defaults --loose-verbose $defaults mysqld server mysqld_safe safe_mysqld` SET_USER=2
parse_arguments `$print_defaults --loose-verbose $defaults mysqld server`
if test $SET_USER -eq 2
then
SET_USER=0
fi
parse_arguments `$print_defaults --loose-verbose $defaults mysqld_safe safe_mysqld`
parse_arguments PICK-ARGS-FROM-ARGV "$@" parse_arguments PICK-ARGS-FROM-ARGV "$@"
if test ! -x $ledir/$MYSQLD if test ! -x $ledir/$MYSQLD
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment