summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHartmut Holzgraefe <50832275+hartmut-mariadb@users.noreply.github.com>2022-10-16 19:18:40 +0200
committerGitHub <noreply@github.com>2022-10-16 18:18:40 +0100
commit950e4f584da2ee937d98ea824e34aa895d737ea3 (patch)
tree05079c6f4eaf9b04e077fc5a5de0a775aac78ece
parentd9092e3de7b6868403f2611508249aa0bcd9022a (diff)
downloadmariadb-git-950e4f584da2ee937d98ea824e34aa895d737ea3.tar.gz
MDEV-6655: mysqld_multi default log location in wrong directory (#2285)
The mysqld_multi script template used @datadir@ as default log destination, this is not the MariaDB datadir in this context though but rather the -- typically write-only -- /share dir. The correct placeholder to use here is @localstatedir@ which gets replaced with the actual MariaDB datadir Co-authored-by: Hartmut Holzgraefe <hartmut@php.net>
-rw-r--r--scripts/mysqld_multi.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh
index 28c39090d03..9a1f3920f67 100644
--- a/scripts/mysqld_multi.sh
+++ b/scripts/mysqld_multi.sh
@@ -227,7 +227,7 @@ sub defaults_for_group
####
#### Init log file. Check for appropriate place for log file, in the following
-#### order: my_print_defaults mysqld datadir, @datadir@
+#### order: my_print_defaults mysqld datadir, @localstatedir@
####
sub init_log
@@ -241,7 +241,7 @@ sub init_log
}
if (!defined($logdir))
{
- $logdir= "@datadir@" if (-d "@datadir@" && -w "@datadir@");
+ $logdir= "@localstatedir@" if (-d "@localstatedir@" && -w "@localstatedir@");
}
if (!defined($logdir))
{