diff options
| author | ale <ale@FreeBSD.org> | 2007-10-08 16:57:59 +0800 |
|---|---|---|
| committer | ale <ale@FreeBSD.org> | 2007-10-08 16:57:59 +0800 |
| commit | d16e9ddfe3f84142c30b69c5cc87defab1d3e9e2 (patch) | |
| tree | 04a33cb2de5cdc487776e0cbc7b5027c496b09a3 /databases/mysql55-server/files | |
| parent | 65d7ca2622c33fff89878d9982e349035cf96569 (diff) | |
| download | freebsd-ports-gnome-d16e9ddfe3f84142c30b69c5cc87defab1d3e9e2.tar.gz freebsd-ports-gnome-d16e9ddfe3f84142c30b69c5cc87defab1d3e9e2.tar.zst freebsd-ports-gnome-d16e9ddfe3f84142c30b69c5cc87defab1d3e9e2.zip | |
Update to 5.1.22 RC release.
Diffstat (limited to 'databases/mysql55-server/files')
| -rw-r--r-- | databases/mysql55-server/files/patch-scripts_mysqld_safe.sh | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/databases/mysql55-server/files/patch-scripts_mysqld_safe.sh b/databases/mysql55-server/files/patch-scripts_mysqld_safe.sh new file mode 100644 index 000000000000..2a30469922f0 --- /dev/null +++ b/databases/mysql55-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 |