Date: Wed, 20 Dec 2017 17:25:20 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r456842 - in head/databases/mariadb102-server: . files Message-ID: <201712201725.vBKHPKBM041882@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Wed Dec 20 17:25:20 2017 New Revision: 456842 URL: https://svnweb.freebsd.org/changeset/ports/456842 Log: databases/mariadb102-server: Add bugfix patch from upstream - Fix mysqld_safe script corrupting database files https://jira.mariadb.org/browse/MDEV-14337 Reported by: Alex Hemp Added: head/databases/mariadb102-server/files/patch-MDEV-14337 (contents, props changed) Modified: head/databases/mariadb102-server/Makefile Modified: head/databases/mariadb102-server/Makefile ============================================================================== --- head/databases/mariadb102-server/Makefile Wed Dec 20 16:55:24 2017 (r456841) +++ head/databases/mariadb102-server/Makefile Wed Dec 20 17:25:20 2017 (r456842) @@ -2,7 +2,7 @@ PORTNAME?= mariadb PORTVERSION= 10.2.11 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases ipv6 MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ Added: head/databases/mariadb102-server/files/patch-MDEV-14337 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mariadb102-server/files/patch-MDEV-14337 Wed Dec 20 17:25:20 2017 (r456842) @@ -0,0 +1,27 @@ +From 36f84744031430747d27bfb2087c7ae51019a70a Mon Sep 17 00:00:00 2001 +From: Sergei Golubchik <serg@mariadb.org> +Date: Fri, 10 Nov 2017 12:48:52 +0100 +Subject: [PATCH] MDEV-14337 mysqld_safe may suppress error messages with + --log-output=file + +don't close stdout/stderr, redirect them to /dev/null instead. +otherwise redirections like >&2 fail with "invalid file descriptor" +--- + scripts/mysqld_safe.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh +index b644184b1e1d..46b376890939 100644 +--- scripts/mysqld_safe.sh.orig ++++ scripts/mysqld_safe.sh +@@ -868,8 +868,8 @@ if expr "${-}" : '.*x' > /dev/null + then + : + else +- exec 1>&- +- exec 2>&- ++ exec 1>/dev/null ++ exec 2>/dev/null + fi + + while true
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712201725.vBKHPKBM041882>