diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-27 13:05:06 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-27 15:14:48 +0200 |
| commit | 5ab70e7f68ba9659dbdd8c71759cfe99ee90ebf2 (patch) | |
| tree | cde569f712505f981e7a43f01e82c600e282c88c /support-files/mariadb@.service.in | |
| parent | ee9a19fb054085fcea006a25ec957e0d5cb01ce8 (diff) | |
| parent | 16bce0f6fe6bcad0091dc45a97a8ac7b33fe9d44 (diff) | |
| download | mariadb-git-5ab70e7f68ba9659dbdd8c71759cfe99ee90ebf2.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'support-files/mariadb@.service.in')
| -rw-r--r-- | support-files/mariadb@.service.in | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.in index 185157a510d..fce35409db6 100644 --- a/support-files/mariadb@.service.in +++ b/support-files/mariadb@.service.in @@ -151,6 +151,13 @@ UMask=007 # LOAD DATA INFILE you can enable PrivateTmp=true for a little more security. PrivateTmp=false +# Set an explicit Start and Stop timeout of 900 seconds (15 minutes!) +# this is the same value as used in SysV init scripts in the past +# if you need a longer timeout, check the KB: +# https://mariadb.com/kb/en/library/systemd/#configuring-the-systemd-service-timeout +TimeoutStartSec=900 +TimeoutStopSec=900 + ## ## Options previously available to be set via [mysqld_safe] ## that now needs to be set by systemd config files as mysqld_safe |