Date: Tue, 10 Jan 2017 03:06:37 +0000 (UTC) From: Jason Unovitch <junovitch@FreeBSD.org> 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 Message-ID: <201701100306.v0A36bH4037812@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701100306.v0A36bH4037812>