summaryrefslogtreecommitdiff
path: root/databases/mysql51-server
diff options
context:
space:
mode:
authorschmonz <schmonz>2014-12-05 17:22:15 +0000
committerschmonz <schmonz>2014-12-05 17:22:15 +0000
commita04a2aeb179517c1458977a442183f0af2c074f3 (patch)
tree494765b8c71937d8264c7dd596608f6104dd1e96 /databases/mysql51-server
parent71612c4dee2afb19a74254da73387758bdba7860 (diff)
downloadpkgsrc-a04a2aeb179517c1458977a442183f0af2c074f3.tar.gz
Pipe mysqld_safe's stdout and stderr to syslog to avoid the problem
in PR pkg/48271. (There's a mysqld_safe switch to log to syslog, which would also work around the problem, at the expense mutually exclusivity with normal MySQL logging). Bump PKGREVISIONs.
Diffstat (limited to 'databases/mysql51-server')
-rw-r--r--databases/mysql51-server/Makefile4
-rw-r--r--databases/mysql51-server/files/mysqld.sh6
2 files changed, 6 insertions, 4 deletions
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index adec4f0628d..da4509a0b14 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2014/10/09 13:44:33 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2014/12/05 17:22:15 schmonz Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= MySQL 5, a free SQL database (server)
CONFLICTS= mysql3-server-[0-9]*
diff --git a/databases/mysql51-server/files/mysqld.sh b/databases/mysql51-server/files/mysqld.sh
index d392aed7b0a..18cff1683c2 100644
--- a/databases/mysql51-server/files/mysqld.sh
+++ b/databases/mysql51-server/files/mysqld.sh
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: mysqld.sh,v 1.2 2014/04/14 00:02:49 rodent Exp $
+# $NetBSD: mysqld.sh,v 1.3 2014/12/05 17:22:15 schmonz Exp $
#
# PROVIDE: mysqld
# REQUIRE: DAEMON LOGIN mountall
@@ -83,7 +83,9 @@ mysqld_start()
cd @PREFIX@
${command} --user=${mysqld_user} --datadir=${mysqld_datadir} \
--pid-file=${mysqld_pidfile} ${mysqld_flags} \
- ${thread_flags} &
+ ${thread_flags} \
+ 2>&1 | logger -t nbmysqld_safe \
+ &
}
if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then