aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorale <ale@FreeBSD.org>2013-05-27 19:59:01 +0800
committerale <ale@FreeBSD.org>2013-05-27 19:59:01 +0800
commitb674821f9eaa99d94ce711a884a93e229f73b180 (patch)
tree7ab05acdd2a6c7c46a4bf3bebc8c91eb3b0667e4
parent97900eaa5fe3976018f72ecc92ab216a758fda91 (diff)
downloadfreebsd-ports-gnome-b674821f9eaa99d94ce711a884a93e229f73b180.tar.gz
freebsd-ports-gnome-b674821f9eaa99d94ce711a884a93e229f73b180.tar.zst
freebsd-ports-gnome-b674821f9eaa99d94ce711a884a93e229f73b180.zip
Pass --defaults-extra-file also to mysql_install_db.
Submitted by: Daniel Ylitalo <daniel@203core.se>
-rw-r--r--databases/mysql55-server/files/mysql-server.in2
-rw-r--r--databases/mysql56-server/files/mysql-server.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/databases/mysql55-server/files/mysql-server.in b/databases/mysql55-server/files/mysql-server.in
index d2cdc080e216..b5015e5505f3 100644
--- a/databases/mysql55-server/files/mysql-server.in
+++ b/databases/mysql55-server/files/mysql-server.in
@@ -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()
{
diff --git a/databases/mysql56-server/files/mysql-server.in b/databases/mysql56-server/files/mysql-server.in
index d2cdc080e216..b5015e5505f3 100644
--- a/databases/mysql56-server/files/mysql-server.in
+++ b/databases/mysql56-server/files/mysql-server.in
@@ -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()
{