diff options
| author |   Francesco Riosa <vivo@gentoo.org> | 2007-03-04 15:47:03 +0000 |
|---|---|---|
| committer | Francesco Riosa <vivo@gentoo.org> | 2007-03-04 15:47:03 +0000 |
| commit | 82500fddc001f3f86d319c0e12334c9d02e0110d (patch) | |
| tree | e87f4022e155e7d849d4b38f12146743e2b9148e /dev-db/mysql-init-scripts | |
| parent | Added ~x86-fbsd keyword, #169274 (diff) | |
| download | gentoo-2-82500fddc001f3f86d319c0e12334c9d02e0110d.tar.gz gentoo-2-82500fddc001f3f86d319c0e12334c9d02e0110d.tar.bz2 gentoo-2-82500fddc001f3f86d319c0e12334c9d02e0110d.zip | |
bug #166606
(Portage version: 2.1.2-r9)
Diffstat (limited to 'dev-db/mysql-init-scripts')
| -rw-r--r-- | dev-db/mysql-init-scripts/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-db/mysql-init-scripts/files/digest-mysql-init-scripts-1.2 (renamed from dev-db/mysql-init-scripts/files/digest-mysql-init-scripts-1.1) | 0 | ||||
| -rw-r--r-- | dev-db/mysql-init-scripts/files/mysql.rc6 | 7 | ||||
| -rw-r--r-- | dev-db/mysql-init-scripts/mysql-init-scripts-1.2.ebuild (renamed from dev-db/mysql-init-scripts/mysql-init-scripts-1.1.ebuild) | 2 |
4 files changed, 12 insertions, 5 deletions
diff --git a/dev-db/mysql-init-scripts/ChangeLog b/dev-db/mysql-init-scripts/ChangeLog index 38be4a31d143..b7a6f78c1f75 100644 --- a/dev-db/mysql-init-scripts/ChangeLog +++ b/dev-db/mysql-init-scripts/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-db/mysql-init-scripts # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog,v 1.1 2007/01/12 16:54:20 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog,v 1.2 2007/03/04 15:47:03 vivo Exp $ + +*mysql-init-scripts-1.2 (04 Mar 2007) + + 04 Mar 2007; Francesco Riosa <vivo@gentoo.org> files/mysql.rc6, + -mysql-init-scripts-1.1.ebuild, +mysql-init-scripts-1.2.ebuild: + workaround for bug #166606 12 Jan 2007; Luca Longinotti <chtekk@gentoo.org> ChangeLog: Move from sys-apps/mysql. diff --git a/dev-db/mysql-init-scripts/files/digest-mysql-init-scripts-1.1 b/dev-db/mysql-init-scripts/files/digest-mysql-init-scripts-1.2 index e69de29bb2d1..e69de29bb2d1 100644 --- a/dev-db/mysql-init-scripts/files/digest-mysql-init-scripts-1.1 +++ b/dev-db/mysql-init-scripts/files/digest-mysql-init-scripts-1.2 diff --git a/dev-db/mysql-init-scripts/files/mysql.rc6 b/dev-db/mysql-init-scripts/files/mysql.rc6 index 68ced6e5aeb2..e67c2ca1d13e 100644 --- a/dev-db/mysql-init-scripts/files/mysql.rc6 +++ b/dev-db/mysql-init-scripts/files/mysql.rc6 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/mysql.rc6,v 1.1 2007/01/12 16:54:20 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/mysql.rc6,v 1.2 2007/03/04 15:47:03 vivo Exp $ # external binaries used: which, sed, tac @@ -272,7 +272,7 @@ start() { mysqld_thing="${mysqld_thing} ${unmanagedparams}" mysqld_thing="${mysqld_thing} --basedir=${basedir}" mysqld_thing="${mysqld_thing} --datadir=${datadir}" - #see bug #158769 mysqld_thing="${mysqld_thing} --pid-file=${pidfile}" + mysqld_thing="${mysqld_thing} --pid-file=${pidfile}" mysqld_thing="${mysqld_thing} --socket=${socket}" wdebug 2 "starting mysqld with: ${mysqld_thing}" @@ -281,7 +281,8 @@ start() { tmpnice="${NICE:+"--nicelevel "}${NICE}" start-stop-daemon --quiet ${DEBUG/*/"--verbose"} --start \ --background ${tmpnice} --pidfile ${pidfile} \ - --exec ${basedir}/sbin/mysqld${MY_SUFFIX} -- ${mysqld_thing} + --exec ${basedir}/sbin/mysqld${MY_SUFFIX} -- ${mysqld_thing} \ + && sleep ${TIMEUNIT} retstatus=$? else tmpnice="${NICE:+"nice -n "}${NICE}" diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-1.1.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-1.2.ebuild index a3f1e769a8b9..ff8502033673 100644 --- a/dev-db/mysql-init-scripts/mysql-init-scripts-1.1.ebuild +++ b/dev-db/mysql-init-scripts/mysql-init-scripts-1.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-1.1.ebuild,v 1.1 2007/01/12 16:54:20 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-1.2.ebuild,v 1.1 2007/03/04 15:47:03 vivo Exp $ DESCRIPTION="Gentoo MySQL init scripts." HOMEPAGE="http://www.gentoo.org/" |