diff options
| author | Dirk Froemberg <dirk@FreeBSD.org> | 2001-03-12 07:06:50 +0000 |
|---|---|---|
| committer | Dirk Froemberg <dirk@FreeBSD.org> | 2001-03-12 07:06:50 +0000 |
| commit | 8d67b310bce287061cec80be21b0a3054f43ce51 (patch) | |
| tree | 63c11460424ce2faf17fd48f9b3860b47723ec96 /databases/mysql60-server/files | |
| parent | Author has changed email addresses and reorganized his website; (diff) | |
Upgrade to 3.23.34a.
Notes
Notes:
svn path=/head/; revision=39623
Diffstat (limited to 'databases/mysql60-server/files')
| -rw-r--r-- | databases/mysql60-server/files/patch-af | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/databases/mysql60-server/files/patch-af b/databases/mysql60-server/files/patch-af index ad1f5ae20877..7cde1a7119d4 100644 --- a/databases/mysql60-server/files/patch-af +++ b/databases/mysql60-server/files/patch-af @@ -1,6 +1,6 @@ ---- scripts/safe_mysqld.sh.orig Thu Jan 4 03:03:55 2001 -+++ scripts/safe_mysqld.sh Fri Jan 5 14:05:04 2001 -@@ -64,26 +64,9 @@ +--- scripts/safe_mysqld.sh.orig Mon Mar 12 00:18:24 2001 ++++ scripts/safe_mysqld.sh Mon Mar 12 07:36:07 2001 +@@ -64,30 +64,9 @@ done } @@ -12,6 +12,10 @@ - MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are - ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is - DATADIR=$MY_BASEDIR_VERSION/data +- if test -z "defaults" +- then +- defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf" +- fi -# Check if this is a 'moved install directory' -elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ - -x ./libexec/mysqld @@ -30,7 +34,7 @@ MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} -@@ -220,34 +203,6 @@ +@@ -224,34 +203,6 @@ if test ! -f $pid_file # This is removed if normal shutdown then break |