From owner-svn-ports-all@FreeBSD.ORG  Mon May 27 11:59:02 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id F1699CF5;
 Mon, 27 May 2013 11:59:01 +0000 (UTC) (envelope-from ale@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E2FF0B59;
 Mon, 27 May 2013 11:59:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4RBx1A9073189;
 Mon, 27 May 2013 11:59:01 GMT (envelope-from ale@svn.freebsd.org)
Received: (from ale@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4RBx15r073187;
 Mon, 27 May 2013 11:59:01 GMT (envelope-from ale@svn.freebsd.org)
Message-Id: <201305271159.r4RBx15r073187@svn.freebsd.org>
From: Alex Dupre <ale@FreeBSD.org>
Date: Mon, 27 May 2013 11:59:01 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r319215 - in head/databases: mysql55-server/files
 mysql56-server/files
X-SVN-Group: ports-head
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 May 2013 11:59:02 -0000

Author: ale
Date: Mon May 27 11:59:01 2013
New Revision: 319215
URL: http://svnweb.freebsd.org/changeset/ports/319215

Log:
  Pass --defaults-extra-file also to mysql_install_db.
  
  Submitted by:	Daniel Ylitalo <daniel@203core.se>

Modified:
  head/databases/mysql55-server/files/mysql-server.in
  head/databases/mysql56-server/files/mysql-server.in

Modified: head/databases/mysql55-server/files/mysql-server.in
==============================================================================
--- head/databases/mysql55-server/files/mysql-server.in	Mon May 27 11:54:47 2013	(r319214)
+++ head/databases/mysql55-server/files/mysql-server.in	Mon May 27 11:59:01 2013	(r319215)
@@ -46,7 +46,7 @@ procname="%%PREFIX%%/libexec/mysqld"
 start_precmd="${name}_prestart"
 start_postcmd="${name}_poststart"
 mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
-mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force"
+mysql_install_db_args="--basedir=%%PREFIX%% --defaults-extra-file=${mysql_optfile} --datadir=${mysql_dbdir} --force"
 
 mysql_create_auth_tables()
 {

Modified: head/databases/mysql56-server/files/mysql-server.in
==============================================================================
--- head/databases/mysql56-server/files/mysql-server.in	Mon May 27 11:54:47 2013	(r319214)
+++ head/databases/mysql56-server/files/mysql-server.in	Mon May 27 11:59:01 2013	(r319215)
@@ -46,7 +46,7 @@ procname="%%PREFIX%%/libexec/mysqld"
 start_precmd="${name}_prestart"
 start_postcmd="${name}_poststart"
 mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
-mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force"
+mysql_install_db_args="--basedir=%%PREFIX%% --defaults-extra-file=${mysql_optfile} --datadir=${mysql_dbdir} --force"
 
 mysql_create_auth_tables()
 {