summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2020-01-15 22:40:56 +0100
committerSergei Golubchik <serg@mariadb.org>2020-01-17 18:14:43 +0100
commit51a9571256204ca81de0148dfb7f9ec73614e31c (patch)
tree6f255e37ee3de616eb56389ff708ff1cc0879082
parent9d18b6246755472c8324bf3e20e234e08ac45618 (diff)
downloadmariadb-git-51a9571256204ca81de0148dfb7f9ec73614e31c.tar.gz
MDEV-20205 mysql_install_db shouldn't execute chown
Make chown error non-fatal. Just print a warning.
-rw-r--r--scripts/mysql_install_db.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index e9744333af5..0de1fe45014 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -487,7 +487,7 @@ then
if test $? -ne 0
then
echo "Couldn't set an owner to '$pamtooldir/auth_pam_tool_dir/auth_pam_tool'."
- echo " It must be root, the PAM authentication plugin doesn't work otherwise.."
+ echo "It must be root, the PAM authentication plugin doesn't work otherwise.."
echo
fi
fi
@@ -496,8 +496,8 @@ then
if test $? -ne 0
then
echo "Cannot change ownership of the '$pamtooldir/auth_pam_tool_dir' directory"
- echo " to the '$user' user. Check that you have the necessary permissions and try again."
- exit 1
+ echo "to the '$user' user. Check that you have the necessary permissions and try again."
+ echo
fi
args="$args --user=$user"
fi