From f92e4169b82db8dc45668630db2d2fa3431cc22a Mon Sep 17 00:00:00 2001 From: Andreas Klemm Date: Sun, 6 Sep 1998 19:58:26 +0000 Subject: This is the latest mysql version. In the future we have to mysql ports, a stable one and a developer version. Under FreeBSD-current this port supports threads ... --- databases/mysql54-server/files/patch-ab | 99 +++++++++++++++++++++++++-------- 1 file changed, 76 insertions(+), 23 deletions(-) (limited to 'databases/mysql54-server/files/patch-ab') diff --git a/databases/mysql54-server/files/patch-ab b/databases/mysql54-server/files/patch-ab index 6f41ac6a3549..2aa751cd44c6 100644 --- a/databases/mysql54-server/files/patch-ab +++ b/databases/mysql54-server/files/patch-ab @@ -1,5 +1,5 @@ ---- scripts/mysql_install_db.sh.orig Mon Jun 29 17:30:30 1998 -+++ scripts/mysql_install_db.sh Fri Aug 14 17:30:19 1998 +--- scripts/mysql_install_db.sh.orig Mon Aug 17 23:09:45 1998 ++++ scripts/mysql_install_db.sh Tue Sep 1 15:38:03 1998 @@ -3,7 +3,6 @@ # For a more info consult the file COPYRIGHT distributed with this file @@ -8,47 +8,100 @@ # # All arguments to this script is passed to safe_mysqld -@@ -27,18 +26,9 @@ +@@ -16,40 +15,12 @@ + bn=`basename $file .frm-new` + mv $file $dir/$bn.frm + done +-else +- if test ! -d "./data" +- then +- echo "Didn't find the 'data' directory in the current directory" +- echo "You should be in the distribution directory when executing this script" +- if test -d "../data" +- then +- echo "We will now try to execute this in the parent directory; If this doesn't" +- echo "work please go to the directory where unpacked this distribution" +- echo "and try again with 'scripts/mysql_install_db'" +- echo +- cd .. +- else +- echo "Please go to the directory where you unpacked this distribution" +- echo "and start this script with 'scripts/mysql_install_db'" +- exit 1 +- fi +- fi + fi if test ! -x @bindir@/mysqladmin then - if test "@localstatedir@" = "./data" - then -- echo "Can't execute @bindir@/mysqladmin" + echo "Can't execute @bindir@/mysqladmin" - echo "You should be in the distribution directory when executing this script" - echo "Please go to the directory where you unpacked this distribution" - echo "and start this script with 'scripts/mysql_install_db'" -- exit 1 -- else - echo "Didn't find @bindir@/mysqladmin" - echo "You should do a 'make install' before executing this script" exit 1 +- else +- echo "Didn't find @bindir@/mysqladmin" +- echo "You should do a 'make install' before executing this script" +- exit 1 - fi fi if test -f @localstatedir@/mysql/db.ISM -@@ -105,10 +95,7 @@ +@@ -65,9 +36,6 @@ + exit 1 + fi - # copy the definition files +-# 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 + + # create database mysql & test +@@ -118,10 +86,7 @@ # --if test "@localstatedir@" != "./data" --then -- cp -p ./data/mysql/*.frm @localstatedir@/mysql --fi -+cp @pkgdatadir@/mysql/*.frm @localstatedir@/mysql + if test ! -f @localstatedir@/mysql/user.frm + then +- if test "@localstatedir@" != "./data" +- then +- cp -p ./data/mysql/*.frm @localstatedir@/mysql +- fi ++ cp -p @pkgdatadir@/mysql/*.frm @localstatedir@/mysql + fi @bindir@/mysql mysql <