summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-09-24 16:52:30 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-09-24 16:52:30 +0300
commit69bd2c88e17df2aa6c0edce5196e70976129dfab (patch)
tree8418a610f98f8ec525420f316e8f61184d636fca /support-files
parent25a5ce367b6a553c6563adfd8869d5961f71b2cd (diff)
parentd7aa81c862b5d813f8fe3440b7e011a555e88d96 (diff)
downloadmariadb-git-69bd2c88e17df2aa6c0edce5196e70976129dfab.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mysql.server.sh15
1 files changed, 7 insertions, 8 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh
index 6eb2d0bc257..7f034601539 100644
--- a/support-files/mysql.server.sh
+++ b/support-files/mysql.server.sh
@@ -91,16 +91,15 @@ datadir_set=
#
# Use LSB init script functions for printing messages, if possible
-#
+# Include non-LSB RedHat init functions to make systemctl redirect work
+init_functions="/etc/init.d/functions"
lsb_functions="/lib/lsb/init-functions"
-if test -f $lsb_functions ; then
+if test -f $lsb_functions; then
. $lsb_functions
-else
- # Include non-LSB RedHat init functions to make systemctl redirect work
- init_functions="/etc/init.d/functions"
- if test -f $init_functions; then
- . $init_functions
- fi
+fi
+
+if test -f $init_functions; then
+ . $init_functions
log_success_msg()
{
echo " SUCCESS! $@"