diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-25 18:42:06 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-25 18:42:06 +0300 |
| commit | e9c1701e11e2441435223cc7c00c467f58aaff19 (patch) | |
| tree | 6be7d0e8fe87272e1abb2704fdb9859481d8acc2 /scripts/mysqld_safe.sh | |
| parent | 17794fb9aac9ca4fcb0b1e5904671a025a1b6b74 (diff) | |
| parent | f3eb82f048d342c11fc3869eca2e6faed9a4835d (diff) | |
| download | mariadb-git-e9c1701e11e2441435223cc7c00c467f58aaff19.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'scripts/mysqld_safe.sh')
| -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 d40dd9a0c5f..f32142e86a8 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -720,9 +720,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 |