diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-23 17:35:29 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-23 17:35:29 +0300 |
| commit | 5a92ccbaea1bb3973e23846a741f5694a1e687bd (patch) | |
| tree | aafc504552502b48b79cadcb06b2b5c7eba4f374 /support-files/mariadb@.service.in | |
| parent | c997af7d1f432dfca922958453f0e2313287f1eb (diff) | |
| parent | c016ea660ede8b7ff75f8ca65f73e2958262263a (diff) | |
| download | mariadb-git-5a92ccbaea1bb3973e23846a741f5694a1e687bd.tar.gz | |
Merge 10.3 into 10.4
Disable MDEV-20576 assertions until MDEV-20595 has been fixed.
Diffstat (limited to 'support-files/mariadb@.service.in')
| -rw-r--r-- | support-files/mariadb@.service.in | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.in index 326d8e52b3c..c66f5a776eb 100644 --- a/support-files/mariadb@.service.in +++ b/support-files/mariadb@.service.in @@ -6,6 +6,19 @@ # scripts are needed. # # +# It's not recommended to modify this file in-place, because it will be +# overwritten during package upgrades. If you want to customize, the +# best way is to create a file "/etc/systemd/system/mariadb@.service", +# containing +# .include /usr/lib/systemd/system/mariadb@.service +# ...make your changes here... +# or create a file "/etc/systemd/system/mariadb@.service.d/foo.conf", +# which doesn't need to include ".include" call and which will be parsed +# after the file mariadb@.service itself is parsed. +# +# For more info about custom unit files, see systemd.unit(5) or +# https://mariadb.com/kb/en/mariadb/systemd/ +# # Copyright notice: # # This file is free software; you can redistribute it and/or modify it @@ -131,7 +144,7 @@ # systemd.service(5) [Unit] -Description=MariaDB @VERSION@ database server (multi-instance) +Description=MariaDB @VERSION@ database server (multi-instance %I) Documentation=man:mysqld(8) Documentation=https://mariadb.com/kb/en/library/systemd/ After=network.target @@ -195,6 +208,8 @@ ExecStartPre=@scriptdir@/mysql_install_db $MYSQLD_MULTI_INSTANCE # Note 1: Place $MYSQLD_OPTS at the very end for its options to take precedence. ExecStart=@sbindir@/mysqld $MYSQLD_MULTI_INSTANCE $MYSQLD_OPTS +@SYSTEMD_EXECSTARTPOST@ + KillSignal=SIGTERM # Don't want to see an automated SIGKILL ever |