diff options
author | Donny Davies <woodchip@gentoo.org> | 2002-10-28 07:15:32 +0000 |
---|---|---|
committer | Donny Davies <woodchip@gentoo.org> | 2002-10-28 07:15:32 +0000 |
commit | a75a863a9b309d0434175118765b9e8896010897 (patch) | |
tree | 8e2480654aa461fb657acba727321d7cded36877 /dev-db/mysql | |
parent | Fixed header. (diff) | |
download | gentoo-2-a75a863a9b309d0434175118765b9e8896010897.tar.gz gentoo-2-a75a863a9b309d0434175118765b9e8896010897.tar.bz2 gentoo-2-a75a863a9b309d0434175118765b9e8896010897.zip |
fix0r
Diffstat (limited to 'dev-db/mysql')
-rw-r--r-- | dev-db/mysql/ChangeLog | 5 | ||||
-rw-r--r-- | dev-db/mysql/files/mysql.init | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index 914a87fb98dd..44b3d67f4bfa 100644 --- 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 8d1517022251..a87902425650 100644 --- 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 $? } |