diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2013-01-05 11:30:51 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2013-01-05 11:30:51 +0000 |
| commit | 87a0e0727b4a6e83720a41c543959f4b4e77df47 (patch) | |
| tree | 1965b778fee6ae0a18b6aaf9146088662c7552f6 /databases/mariadb55-server/files/patch-scripts_mysqld_safe.sh | |
| parent | Mark moinmoin vulnerable (diff) | |
Add the 5.5 branch of MariaDB
PR: ports/174660
Submitted by: Alexandr Kovalenko <never@nevermind.kiev.ua>
Approved by: geoffroy desvernay <dgeo@centrale-marseille.fr>
(maintainer of databases/mariadb-*)
Notes
Notes:
svn path=/head/; revision=309955
Diffstat (limited to 'databases/mariadb55-server/files/patch-scripts_mysqld_safe.sh')
| -rw-r--r-- | databases/mariadb55-server/files/patch-scripts_mysqld_safe.sh | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/databases/mariadb55-server/files/patch-scripts_mysqld_safe.sh b/databases/mariadb55-server/files/patch-scripts_mysqld_safe.sh new file mode 100644 index 000000000000..2a30469922f0 --- /dev/null +++ b/databases/mariadb55-server/files/patch-scripts_mysqld_safe.sh @@ -0,0 +1,24 @@ +--- 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 @@ + + if test -z "$MYSQL_HOME" + then +- if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf" ++ if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf" + then + log_error "WARNING: Found two instances of my.cnf - +-$MY_BASEDIR_VERSION/my.cnf and ++$MY_BASEDIR_VERSION/etc/my.cnf and + $DATADIR/my.cnf + IGNORING $DATADIR/my.cnf" + +@@ -254,7 +254,7 @@ + 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" + MYSQL_HOME=$DATADIR + else + MYSQL_HOME=$MY_BASEDIR_VERSION |