database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.1 into 10.2

Browse Source
This commit is contained in:
Eugene Kosov
2019-07-09 13:22:22 +03:00
parent b9557418cc fd08f95322
commit 26c389b7b7
49 changed files with 619 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/mysqld_safe.sh
View File

@ -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