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.

6 files changed, 18 insertions, 10 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
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 19e693ae090..714551ba99d 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2014/10/09 13:44:34 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2014/12/05 17:22:16 schmonz Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
+PKGREVISION=	1
 COMMENT=	MySQL 5, a free SQL database (server)
 
 CONFLICTS=	mysql3-server-[0-9]*
diff --git a/databases/mysql55-server/files/mysqld.sh b/databases/mysql55-server/files/mysqld.sh
index ce2124c391e..53c1771f7c8 100644
--- a/databases/mysql55-server/files/mysqld.sh
+++ b/databases/mysql55-server/files/mysqld.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: mysqld.sh,v 1.2 2014/04/14 00:02:50 rodent Exp $
+# $NetBSD: mysqld.sh,v 1.3 2014/12/05 17:22:16 schmonz Exp $
 #
 # PROVIDE: mysqld
 # REQUIRE: DAEMON LOGIN mountall
@@ -77,7 +77,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
diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
index b0cf4fcc3ad..a38a5bef62a 100644
--- a/databases/mysql56-server/Makefile
+++ b/databases/mysql56-server/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2014/10/09 13:44:34 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2014/12/05 17:22:16 schmonz Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
+PKGREVISION=	1
 COMMENT=	MySQL 5, a free SQL database (server)
 
 CONFLICTS=	mysql3-server-[0-9]*
diff --git a/databases/mysql56-server/files/mysqld.sh b/databases/mysql56-server/files/mysqld.sh
index 2088c5675ea..73684a10eb5 100644
--- a/databases/mysql56-server/files/mysqld.sh
+++ b/databases/mysql56-server/files/mysqld.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: mysqld.sh,v 1.2 2014/04/14 00:02:50 rodent Exp $
+# $NetBSD: mysqld.sh,v 1.3 2014/12/05 17:22:16 schmonz Exp $
 #
 # PROVIDE: mysqld
 # REQUIRE: DAEMON LOGIN mountall
@@ -76,7 +76,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