diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2007-10-08 08:57:59 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2007-10-08 08:57:59 +0000 |
| commit | 6ca542df3cc1df035c144ebda422f4125f445bf8 (patch) | |
| tree | eed90686c3cc3c05bac542ccbec6151cbedee951 /databases/mysql60-server/files | |
| parent | - tmpdir fix [1] (diff) | |
Update to 5.1.22 RC release.
Notes
Notes:
svn path=/head/; revision=201074
Diffstat (limited to 'databases/mysql60-server/files')
| -rw-r--r-- | databases/mysql60-server/files/patch-scripts_mysqld_safe.sh | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/databases/mysql60-server/files/patch-scripts_mysqld_safe.sh b/databases/mysql60-server/files/patch-scripts_mysqld_safe.sh new file mode 100644 index 000000000000..2a30469922f0 --- /dev/null +++ b/databases/mysql60-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 |