diff options
| author | Eugene Kosov <claprix@yandex.ru> | 2019-07-09 13:22:22 +0300 |
|---|---|---|
| committer | Eugene Kosov <claprix@yandex.ru> | 2019-07-09 13:22:22 +0300 |
| commit | 26c389b7b770a3699ec1fc81df7f379f6084c9e6 (patch) | |
| tree | 7f915e858b211834deeb52928dfdf5ab12b24bfe /scripts | |
| parent | b9557418ccd9f484806515fba030757274e691f2 (diff) | |
| parent | fd08f953222b854428dc259631e8fc707fe34619 (diff) | |
| download | mariadb-git-26c389b7b770a3699ec1fc81df7f379f6084c9e6.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysqld_safe.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index c0be1ea6e60..d4f13eadf4b 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -740,9 +740,9 @@ 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` + if ! mkdir -p $mysql_unix_port_dir then log_error "Fatal error Can't create database directory '$mysql_unix_port'" exit 1 |