diff options
| author | Eugene Kosov <eugene.kosov@mariadb.com> | 2019-07-16 15:42:36 +0300 |
|---|---|---|
| committer | Eugene Kosov <eugene.kosov@mariadb.com> | 2019-07-16 18:39:21 +0300 |
| commit | 0f83c8878dc1389212c134f65d37a43d9d248250 (patch) | |
| tree | 6950ea9b6c449a6e5d8a0205b3d06ae275a6234c /scripts | |
| parent | aa96e56c55c44d2c20c1cd70325ef88ad0af8f98 (diff) | |
| parent | d2f094d9e63e97293915b17b30a73b2552647a38 (diff) | |
| download | mariadb-git-0f83c8878dc1389212c134f65d37a43d9d248250.tar.gz | |
Merge 10.2 into 10.3
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 5797bdc68d7..e23be9c4ad1 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -711,9 +711,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 |