From d81b273982dd282c51b0b3def0dd4310fb141554 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sat, 7 Jul 2012 17:08:27 +0200
Subject: MySQl: sync with rawhide

---
 mysqld.service | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'mysqld.service')

diff --git a/mysqld.service b/mysqld.service
index 7289f9d..c6e4dea 100644
--- a/mysqld.service
+++ b/mysqld.service
@@ -23,22 +23,19 @@ After=syslog.target
 After=network.target
 
 [Service]
-Type=forking
+Type=simple
 User=mysql
 Group=mysql
 
 ExecStartPre=/usr/libexec/mysqld-prepare-db-dir
 # Note: we set --basedir to prevent probes that might trigger SELinux alarms,
 # per bug #547485
-ExecStart=/usr/bin/mysqld_safe --nowatch --basedir=/usr
+ExecStart=/usr/bin/mysqld_safe --basedir=/usr
 ExecStartPost=/usr/libexec/mysqld-wait-ready $MAINPID
 
 # Give a reasonable amount of time for the server to start up/shut down
 TimeoutSec=300
 
-# We rely on systemd, not mysqld_safe, to restart mysqld if it dies
-Restart=always
-
 # Place temp files in a secure directory, not /tmp
 PrivateTmp=true
 
-- 
cgit