summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2019-06-30 11:16:33 +0200
committerSergei Golubchik <serg@mariadb.org>2019-07-04 18:19:52 +0200
commitbee24fe18188c81f52ae3bfa4ff42a2137480a6b (patch)
tree676e5de32f869004742112a4368310582b72d5f0 /scripts
parent1003c76eb4151e602b0f25b941bdef3810396b7e (diff)
downloadmariadb-git-bee24fe18188c81f52ae3bfa4ff42a2137480a6b.tar.gz
MDEV-19726 MariaDB server or backup RPM install assumes mysql user exists
mysqld_safe shouldn't try to mkdir or chown if --dry-run
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysqld_safe.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index c7e232673a4..d51867d9d17 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -752,7 +752,7 @@ fi
safe_mysql_unix_port=${mysql_unix_port:-${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}}
# Make sure that directory for $safe_mysql_unix_port exists
mysql_unix_port_dir=`dirname $safe_mysql_unix_port`
-if [ ! -d $mysql_unix_port_dir ]
+if [ ! -d $mysql_unix_port_dir -a $dry_run -eq 0 ]
then
if ! mkdir -p $mysql_unix_port_dir
then