fix0r

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 914a87fb98dd7f058855e8b5a35fabf7b973b489..44b3d67f4bfa93fd354411874687695aaedb24d6 100644 (file)
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.20 2002/10/27 07:54:33 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.21 2002/10/28 07:15:32 woodchip Exp $
+
+  28 Oct 2002; Donny Davies <woodchip@gentoo.org> mysql.init :
+  Behave more carefully in stop().  Thanks psi-jack@myrealbox.com.
 
 *mysql-3.23.53 (27 Oct 2002)
 

diff --git a/dev-db/mysql/files/mysql.init b/dev-db/mysql/files/mysql.init
index 8d15170222518830e17d47c9efdb5d40d167fc24..a879024256504a72b9c42564b94a8ced0e30df89 100644 (file)
--- a/dev-db/mysql/files/mysql.init
+++ b/dev-db/mysql/files/mysql.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql.init,v 1.1 2002/07/26 03:01:13 jnelson Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql.init,v 1.2 2002/10/28 07:15:32 woodchip Exp $
 
 depend() {
        need net
@@ -24,13 +24,13 @@ checkconfig() {
 start() {
        checkconfig || return 1
        ebegin "Starting mysqld"
-       start-stop-daemon --start --quiet --exec /usr/bin/safe_mysqld \
-               --background -- >/dev/null 2>&1
+       /usr/bin/safe_mysqld >/dev/null 2>&1 &
        eend $?
 }
 
 stop () {
        ebegin "Stopping mysqld"
-       start-stop-daemon --stop --quiet --pidfile=/var/run/mysqld/mysqld.pid
+       start-stop-daemon --stop --quiet \
+               --pidfile=/var/run/mysqld/mysqld.pid --retry 20
        eend $?
 }