mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
merge with 4.0.15
This commit is contained in:
@@ -33,6 +33,7 @@ parse_arguments() {
|
||||
--basedir=*) basedir=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
|
||||
--ldata=*|--datadir=*) ldata=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
|
||||
--user=*) user=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
|
||||
--skip-name-resolve) ip_only=1 ;;
|
||||
--verbose) verbose=1 ;;
|
||||
--rpm) in_rpm=1 ;;
|
||||
--windows) windows=1 ;;
|
||||
@@ -166,6 +167,12 @@ then
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$ip_only" -eq 1
|
||||
then
|
||||
ip=`echo "$resolved" | awk '/ /{print $6}'`
|
||||
hostname=$ip
|
||||
fi
|
||||
|
||||
# Create database directories mysql & test
|
||||
|
||||
if test ! -d $ldata; then mkdir $ldata; chmod 700 $ldata ; fi
|
||||
|
Reference in New Issue
Block a user