--- trunk/mysql5/mysqld.service	2011/06/29 07:14:08	1372
+++ trunk/mysql5/mysqld.service	2011/06/29 07:15:12	1373
@@ -6,7 +6,8 @@
 Type=simple
 User=mysql
 Group=mysql
-ExecStart=/usr/bin/mysqld_safe --basedir=/usr --datadir=/var/lib/mysql --pidfile=/var/run/mysqld/mysqld.pid --socket=/var/run/mysqld/mysqld.sock --user=mysql
+ExecStart=/usr/bin/mysqld_safe --basedir=/usr --datadir=/var/lib/mysql --pid-file=/var/run/mysqld/mysqld.pid --socket=/var/run/mysqld/mysqld.sock --user=mysql
+ExecStop=/bin/kill -15 $MAINPID
 TimeoutSec=60
 RemainAfterExit=yes