summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2016-06-27 18:01:21 -0400
committerNirbhay Choubey <nirbhay@mariadb.com>2016-06-27 18:01:21 -0400
commit064569906083b24fc980e044cbb3b3427768249f (patch)
tree4931609f9f1f9d5ac8a5087af3237f42a43c9454 /support-files
parent2768829e5397756faeae706df80bdba468f77795 (diff)
downloadmariadb-git-064569906083b24fc980e044cbb3b3427768249f.tar.gz
MDEV-10145: Systemd fails to start mysqld in multi-instance mode
--defaults-xxx options must be placed before all other options in the command line. Also moved MYSQLD_OPTS at the end so that its options take precedence.
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mariadb@.service.in8
1 files changed, 6 insertions, 2 deletions
diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.in
index fb3b4b5f41d..ff87b66bf3c 100644
--- a/support-files/mariadb@.service.in
+++ b/support-files/mariadb@.service.in
@@ -64,11 +64,15 @@ PermissionsStartOnly=true
# This isn't a replacement for my.cnf.
# _WSREP_NEW_CLUSTER is for the exclusive use of the script galera_new_cluster
-ExecStart=/usr/sbin/mysqld $MYSQLD_OPTS $_WSREP_NEW_CLUSTER --defaults-file=@INSTALL_SYSCONF2DIR@/my%I.cnf
+# Note: Place $MYSQLD_OPTS at the very end for its options to take precedence.
+
+ExecStart=/usr/sbin/mysqld --defaults-file=@INSTALL_SYSCONF2DIR@/my%I.cnf \
+ $_WSREP_NEW_CLUSTER $MYSQLD_OPTS
# Alternate: (remove ConditionPathExists above)
# use [mysqld.INSTANCENAME] as sections in my.cnf
#
-# ExecStart=/usr/sbin/mysqld $MYSQLD_OPTS --defaults-group-suffix=%I
+# ExecStart=/usr/sbin/mysqld --defaults-group-suffix=%I \
+# $_WSREP_NEW_CLUSTER $MYSQLD_OPTS
KillMode=process
KillSignal=SIGTERM