From owner-svn-ports-all@freebsd.org  Tue Jan 10 03:06:38 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0EA83CA8789;
 Tue, 10 Jan 2017 03:06:38 +0000 (UTC)
 (envelope-from junovitch@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D180A1031;
 Tue, 10 Jan 2017 03:06:37 +0000 (UTC)
 (envelope-from junovitch@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0A36b60037813;
 Tue, 10 Jan 2017 03:06:37 GMT (envelope-from junovitch@FreeBSD.org)
Received: (from junovitch@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0A36bH4037812;
 Tue, 10 Jan 2017 03:06:37 GMT (envelope-from junovitch@FreeBSD.org)
Message-Id: <201701100306.v0A36bH4037812@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: junovitch set sender to
 junovitch@FreeBSD.org using -f
From: Jason Unovitch <junovitch@FreeBSD.org>
Date: Tue, 10 Jan 2017 03:06:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r431062 - branches/2017Q1/databases/mariadb55-server/files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Jan 2017 03:06:38 -0000

Author: junovitch
Date: Tue Jan 10 03:06:36 2017
New Revision: 431062
URL: https://svnweb.freebsd.org/changeset/ports/431062

Log:
  MFH: r430977
  
  Fix patch.
  
  Sponsored by:	Absolight
  Approved by:	ports-secteam (blanket)

Modified:
  branches/2017Q1/databases/mariadb55-server/files/patch-scripts_mysqld_safe.sh
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/databases/mariadb55-server/files/patch-scripts_mysqld_safe.sh
==============================================================================
--- branches/2017Q1/databases/mariadb55-server/files/patch-scripts_mysqld_safe.sh	Tue Jan 10 02:55:19 2017	(r431061)
+++ branches/2017Q1/databases/mariadb55-server/files/patch-scripts_mysqld_safe.sh	Tue Jan 10 03:06:36 2017	(r431062)
@@ -1,6 +1,6 @@
---- scripts/mysqld_safe.sh.orig	2007-10-08 10:39:23.000000000 +0200
-+++ scripts/mysqld_safe.sh	2007-10-08 10:40:52.000000000 +0200
-@@ -242,10 +242,10 @@
+--- scripts/mysqld_safe.sh.orig	2017-01-09 14:36:43 UTC
++++ scripts/mysqld_safe.sh
+@@ -468,10 +468,10 @@ fi
  
  if test -z "$MYSQL_HOME"
  then 
@@ -13,12 +13,12 @@
  $DATADIR/my.cnf
  IGNORING $DATADIR/my.cnf"
  
-@@ -254,7 +254,7 @@
+@@ -480,7 +480,7 @@ IGNORING $DATADIR/my.cnf"
    then
      log_error "WARNING: Found $DATADIR/my.cnf
  The data directory is a deprecated location for my.cnf, please move it to
 -$MY_BASEDIR_VERSION/my.cnf"
 +$MY_BASEDIR_VERSION/etc/my.cnf"
+     unsafe_my_cnf=1
      MYSQL_HOME=$DATADIR
    else
-     MYSQL_HOME=$MY_BASEDIR_VERSION