1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-8534 [PATCH] mysql_secure_installation doesn't pass "socket" to "mysql"

Browse Source 
backport https://github.com/MariaDB/server/pull/88 to 10.0
This commit is contained in:
Sergei Golubchik 2015-07-25 12:17:10 +02:00
parent 517ef2bd39
commit 39f5234a6d
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/mysql_secure_installation.sh
View File

@ -25,6 +25,9 @@ echo_n=
echo_c= echo_c=
basedir= basedir=
bindir= bindir=
defaults_file=
defaults_extra_file=
no_defaults=
parse_arg() parse_arg()
{ {
@ -47,8 +50,9 @@ parse_arguments()
do do
case "$arg" in case "$arg" in
--basedir=*) basedir=`parse_arg "$arg"` ;; --basedir=*) basedir=`parse_arg "$arg"` ;;
--no-defaults|--defaults-file=*|--defaults-extra-file=*) --defaults-file=*) defaults_file=`parse_arg "$arg"` ;;
defaults="$arg" ;; --defaults-extra-file=*) defaults_extra_file="$arg" ;;
--no-defaults) no_defaults="$arg" ;;
*) *)
if test -n "$pick_args" if test -n "$pick_args"
then then
@ -204,7 +208,7 @@ prepare() {
do_query() { do_query() {
echo "$1" >$command echo "$1" >$command
#sed 's,^,> ,' < $command # Debugging #sed 's,^,> ,' < $command # Debugging
$mysql_command --defaults-file=$config <$command $mysql_command --defaults-file=$config $defaults_extra_file $no_defaults $args <$command
return $? return $?
} }
@ -235,6 +239,11 @@ make_config() {
esc_pass=`basic_single_escape "$rootpass"` esc_pass=`basic_single_escape "$rootpass"`
echo "password='$esc_pass'" >>$config echo "password='$esc_pass'" >>$config
#sed 's,^,> ,' < $config # Debugging #sed 's,^,> ,' < $config # Debugging
if test -n "$defaults_file"
then
cat "$defaults_file" >>$config
fi
} }
get_root_password() { get_root_password() {