diff options
| author | he <he> | 2009-02-05 13:46:36 +0000 |
|---|---|---|
| committer | he <he> | 2009-02-05 13:46:36 +0000 |
| commit | 76ae047200d09e557e9e7ee748d793c6ab3a0033 (patch) | |
| tree | fe1137e6f505a5f0d6307c4534b3807e0757427b /databases | |
| parent | ce9fb2f12fa46bf8cb18e0bd97352d689c5901cc (diff) | |
| download | pkgsrc-76ae047200d09e557e9e7ee748d793c6ab3a0033.tar.gz | |
Update from version 4.1.22nb2 to 4.1.22nb3.
One minor change to the rc.d script:
o Postpone setting pidfile to after /etc/rc.conf has been consulted,
so that a non-default setting of mysqld_datadir takes effect.
Without this, mysqld will not start with a non-default mysqld_datadir.
Should fix PR#30636.
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql4-server/Makefile | 4 | ||||
| -rw-r--r-- | databases/mysql4-server/files/mysqld.sh | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/databases/mysql4-server/Makefile b/databases/mysql4-server/Makefile index 8d034e4ff8d..9be184b0f8c 100644 --- a/databases/mysql4-server/Makefile +++ b/databases/mysql4-server/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.38 2008/03/26 13:27:16 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2009/02/05 13:46:36 he Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} SVR4_PKGNAME= mysqs -PKGREVISION= 2 +PKGREVISION= 3 COMMENT= MySQL 4, a free SQL database (server) CONFLICTS= {mysql-server-[0-9]*,mysql3-server-[0-9]*} diff --git a/databases/mysql4-server/files/mysqld.sh b/databases/mysql4-server/files/mysqld.sh index c5ec57afff1..960dc1ea191 100644 --- a/databases/mysql4-server/files/mysqld.sh +++ b/databases/mysql4-server/files/mysqld.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: mysqld.sh,v 1.6 2008/03/26 13:22:00 wiz Exp $ +# $NetBSD: mysqld.sh,v 1.7 2009/02/05 13:46:36 he Exp $ # # PROVIDE: mysqld # REQUIRE: DAEMON LOGIN mountall @@ -27,7 +27,6 @@ procname="@PREFIX@/libexec/${name}" : ${mysqld_user:=@MYSQL_USER@} : ${mysqld_group:=@MYSQL_GROUP@} : ${mysqld_datadir:=@MYSQL_DATADIR@} -pidfile="${mysqld_datadir}/`@HOSTNAME_CMD@`.pid" extra_commands="initdb" initdb_cmd="mysqld_initdb" @@ -80,11 +79,13 @@ mysqld_start() if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then load_rc_config $name + pidfile="${mysqld_datadir}/`@HOSTNAME_CMD@`.pid" run_rc_command "$1" else if [ -f /etc/rc.conf ]; then . /etc/rc.conf fi + pidfile="${mysqld_datadir}/`@HOSTNAME_CMD@`.pid" case "$1" in initdb) eval ${initdb_cmd} |