summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-04-14 16:13:35 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-04-14 16:13:35 +0300
commitccaec18b3934ee384296b4597bdf462fac66c5a4 (patch)
tree167d2ec1374cb4812165958db6fe3bd43619157b /support-files
parente40ed0e881690ed072c28c0f4080a3cfb83e5d73 (diff)
parent26f0cd8afcbdceff22223d4c521c3ce73ee09fda (diff)
downloadmariadb-git-ccaec18b3934ee384296b4597bdf462fac66c5a4.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mariadb.service.in2
-rw-r--r--support-files/mariadb@.service.in4
-rw-r--r--support-files/rpm/my.cnf2
3 files changed, 4 insertions, 4 deletions
diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in
index 49d7c3efb74..1c79a0d8678 100644
--- a/support-files/mariadb.service.in
+++ b/support-files/mariadb.service.in
@@ -75,7 +75,7 @@ PermissionsStartOnly=true
# Do not panic if galera_recovery script is not available. (MDEV-10538)
ExecStartPre=/bin/sh -c "systemctl unset-environment _WSREP_START_POSITION"
ExecStartPre=/bin/sh -c "[ ! -e @bindir@/galera_recovery ] && VAR= || \
- VAR=`@bindir@/galera_recovery`; [ $? -eq 0 ] \
+ VAR=`cd @bindir@/..; @bindir@/galera_recovery`; [ $? -eq 0 ] \
&& systemctl set-environment _WSREP_START_POSITION=$VAR || exit 1"
# Needed to create system tables etc.
diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.in
index 184298dab47..79402287592 100644
--- a/support-files/mariadb@.service.in
+++ b/support-files/mariadb@.service.in
@@ -84,14 +84,14 @@ PermissionsStartOnly=true
ExecStartPre=/bin/sh -c "systemctl unset-environment _WSREP_START_POSITION%I"
ExecStartPre=/bin/sh -c "[ ! -e @bindir@/galera_recovery ] && VAR= || \
- VAR=`@bindir@/galera_recovery --defaults-file=@sysconf2dir@/my%I.cnf`; [ $? -eq 0 ] \
+ VAR=`cd @bindir@/..; @bindir@/galera_recovery --defaults-file=@sysconf2dir@/my%I.cnf`; [ $? -eq 0 ] \
&& systemctl set-environment _WSREP_START_POSITION%I=$VAR || exit 1"
# Alternate: (remove ConditionPathExists above)
# use [mysqld.INSTANCENAME] as sections in my.cnf
#
#ExecStartPre=/bin/sh -c "[ ! -e @bindir@/galera_recovery ] && VAR= || \
-# VAR=`@bindir@/galera_recovery --defaults-group-suffix=%I`; [ $? -eq 0 ] \
+# VAR=`cd @bindir@/..; @bindir@/galera_recovery --defaults-group-suffix=%I`; [ $? -eq 0 ] \
# && systemctl set-environment _WSREP_START_POSITION%I=$VAR || exit 1"
# Needed to create system tables etc.
diff --git a/support-files/rpm/my.cnf b/support-files/rpm/my.cnf
index 913b88f8328..8c6a7139de5 100644
--- a/support-files/rpm/my.cnf
+++ b/support-files/rpm/my.cnf
@@ -5,7 +5,7 @@
[client-server]
#
-# include all files from the config directory
+# include *.cnf from the config directory
#
!includedir /etc/my.cnf.d