diff options
author | Dirk Froemberg <dirk@FreeBSD.org> | 1998-12-24 01:14:13 +0000 |
---|---|---|
committer | Dirk Froemberg <dirk@FreeBSD.org> | 1998-12-24 01:14:13 +0000 |
commit | 747178be68dd8a366c0c8d6045fccefcc595766a (patch) | |
tree | 8283f6445ea1bbe873b3deb768475db721111357 /databases/mysql41-server/files | |
parent | Update maintainer's Email address and fix build for -current. (diff) |
Upgrade to 3.22.13-beta.
Notes
Notes:
svn path=/head/; revision=15549
Diffstat (limited to 'databases/mysql41-server/files')
-rw-r--r-- | databases/mysql41-server/files/patch-ab | 35 | ||||
-rw-r--r-- | databases/mysql41-server/files/patch-af | 6 |
2 files changed, 25 insertions, 16 deletions
diff --git a/databases/mysql41-server/files/patch-ab b/databases/mysql41-server/files/patch-ab index bd7b2aff7375..506d72b13a3c 100644 --- a/databases/mysql41-server/files/patch-ab +++ b/databases/mysql41-server/files/patch-ab @@ -1,29 +1,38 @@ ---- scripts/mysql_install_db.sh.orig Sun Nov 22 04:57:20 1998 -+++ scripts/mysql_install_db.sh Sun Dec 6 23:58:49 1998 -@@ -10,8 +10,8 @@ +--- scripts/mysql_install_db.sh.orig Wed Dec 9 12:48:04 1998 ++++ scripts/mysql_install_db.sh Wed Dec 23 23:39:46 1998 +@@ -11,8 +11,8 @@ + ldata=@localstatedir@ + mdata=$ldata/mysql - mdata=@localstatedir@/mysql - --# Are we are doing a rpm install? +-# Are we doing an rpm install? -if test "$1" = "-IN-RPM"; then IN_RPM=1; shift; fi +# pretend we're doing an RPM install +IN_RPM=1 if test ! -x @libexecdir@/mysqld then -@@ -31,12 +31,9 @@ +@@ -27,8 +27,6 @@ + fi + fi + +-# On IRIX hostname is in /usr/bsd so add this to the path +-PATH=$PATH:/usr/bsd hostname=`hostname` # Install this too in the user table + # Check if hostname is valid +@@ -44,12 +42,9 @@ + fi + # Create database directories mysql & test -if test -z "$IN_RPM" -then -- if test ! -d @localstatedir@; then mkdir @localstatedir@; fi -- if test ! -d @localstatedir@/mysql; then mkdir @localstatedir@/mysql; fi -- if test ! -d @localstatedir@/test; then mkdir @localstatedir@/test; fi +- if test ! -d $ldata; then mkdir $ldata; fi +- if test ! -d $ldata/mysql; then mkdir $ldata/mysql; fi +- if test ! -d $ldata/test; then mkdir $ldata/test; fi -fi -+if test ! -d @localstatedir@; then mkdir @localstatedir@; fi -+if test ! -d @localstatedir@/mysql; then mkdir @localstatedir@/mysql; fi -+if test ! -d @localstatedir@/test; then mkdir @localstatedir@/test; fi ++if test ! -d $ldata; then mkdir $ldata; fi ++if test ! -d $ldata/mysql; then mkdir $ldata/mysql; fi ++if test ! -d $ldata/test; then mkdir $ldata/test; fi # Initialize variables c_d="" i_d="" diff --git a/databases/mysql41-server/files/patch-af b/databases/mysql41-server/files/patch-af index 9318e20d9f0a..c9dfae350bef 100644 --- a/databases/mysql41-server/files/patch-af +++ b/databases/mysql41-server/files/patch-af @@ -1,11 +1,11 @@ ---- scripts/safe_mysqld.sh.orig Wed Nov 4 13:21:22 1998 -+++ scripts/safe_mysqld.sh Tue Nov 10 16:59:51 1998 +--- scripts/safe_mysqld.sh.orig Fri Nov 27 00:37:54 1998 ++++ scripts/safe_mysqld.sh Wed Dec 23 23:45:24 1998 @@ -12,33 +12,9 @@ trap '' 1 2 3 15 # we shouldn't let anyone kill us -# Check if we are starting this relative (for the binary release) --if test -f ./data/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ +-if test -d ./data/mysql -a -f ./share/mysql/english/errmsg.sys -a \ - -x ./bin/mysqld -then - MY_BASEDIR_VERSION=`pwd` # Where bin, share and data is |