Update to version 3.22.10-beta.

PR:		8701
Submitted by:	maintainer

5 files changed, 36 insertions, 125 deletions

diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 58d40fc5d51..5ed911d49de 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -3,11 +3,11 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.30 1998/10/22 07:47:24 thepish Exp $
+# $Id: Makefile,v 1.31 1998/11/11 05:37:08 asami Exp $
 #
 
-DISTNAME=	mysql-3.22.9-beta
-PKGNAME=	mysql-3.22.9b
+DISTNAME=	mysql-3.22.10-beta
+PKGNAME=	mysql-3.22.10b
 CATEGORIES=	databases
 MASTER_SITES=	http://mysql.polaris.ca/Downloads/MySQL-3.22/ \
 		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
@@ -68,9 +68,7 @@ pre-install:
 
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
-	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
 	${PREFIX}/bin/mysql_install_db
-	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo
index b51827f250a..0406b878e0d 100644
--- a/databases/mysql60-server/distinfo
+++ b/databases/mysql60-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.22.9-beta.tar.gz) = 1abe771fba482e473937ecd4bff95258
+MD5 (mysql-3.22.10-beta.tar.gz) = 64ab811e0b5bc50733eb7941b784830d
diff --git a/databases/mysql60-server/files/patch-ab b/databases/mysql60-server/files/patch-ab
index 1698b84a1df..004634cad72 100644
--- a/databases/mysql60-server/files/patch-ab
+++ b/databases/mysql60-server/files/patch-ab
@@ -1,119 +1,35 @@
---- scripts/mysql_install_db.sh.orig	Sun Oct 18 23:59:46 1998
-+++ scripts/mysql_install_db.sh	Wed Oct 21 15:22:31 1998
-@@ -3,7 +3,6 @@
- # For a more info consult the file COPYRIGHT distributed with this file
+--- scripts/mysql_install_db.sh.orig	Wed Nov  4 21:25:07 1998
++++ scripts/mysql_install_db.sh	Tue Nov 10 16:54:46 1998
+@@ -11,7 +11,7 @@
+ mdata=@localstatedir@/mysql
  
- # This scripts creates the privilige tables db, host, user in mysql
--# It should be run from the top level installation directory.
- #
- # All arguments to this script is passed to safe_mysqld
+ # Are we are doing a rpm install?
+-if test "$1" = "-IN-RPM"; then IN_RPM=1; shift; fi
++if test "$1" = "-IN-RPM"; then shift; fi
  
-@@ -11,36 +10,8 @@
- 
- if test "$1" = "-IN-RPM"
+ if test ! -x @libexecdir@/mysqld
  then
--  # We are doing a rpm install.
--  IN_RPM=1; shift
--  # First check if we already have the mysql database.
--  if test -f $mdata/user.frm-new -a ! -f $mdata/user.ISM
--  then
--    for file in $mdata/*.frm-new
--    do
--      dir=`dirname $file`
--      bn=`basename $file .frm-new`
--      cp $file $dir/$bn.frm
--    done
--  fi
--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
-+  # Make -IN-RPM a noop, just in case...
-+  shift
- fi
- 
- if test ! -x @bindir@/mysqladmin
-@@ -51,17 +22,6 @@
-     ls -l /usr/bin/mysql*
-     echo "Didn't find @bindir@/mysqladmin"
-     exit 1
--  elif test "@localstatedir@" = "./data"
--  then
--    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
-   fi
- fi
- 
-@@ -84,9 +44,6 @@
+@@ -26,8 +26,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
  
- # create database mysql & test
-@@ -142,10 +99,7 @@
- then
-   if test ! -f @localstatedir@/mysql/user.frm
-   then
--    if test "@localstatedir@" != "./data"
--    then
--      cp -p ./data/mysql/*.frm @localstatedir@/mysql
--    fi
-+    cp -p ./data/mysql/*.frm @localstatedir@/mysql
-   fi
- fi
- 
-@@ -175,9 +129,6 @@
- # Dumping data for table 'user'
- #
- 
--INSERT INTO user VALUES ('localhost','@MYSQLD_USER@','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
--INSERT INTO user VALUES ('$hostname','@MYSQLD_USER@','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
--
- REPLACE INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
- REPLACE INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
- 
-@@ -185,6 +136,13 @@
- INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N');
+ # Create database directories mysql & test
+@@ -149,22 +147,9 @@
  END_OF_DATA
- 
-+if [ @MYSQLD_USER@ != root ]; then
-+  @bindir@/mysql mysql <<END_OF_DATA
-+INSERT INTO user VALUES ('localhost','@MYSQLD_USER@','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
-+INSERT INTO user VALUES ('$hostname','@MYSQLD_USER@','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
-+END_OF_DATA
-+fi
-+
- if test $? -eq 0
- then 
-   @bindir@/mysqladmin reload
-@@ -197,13 +155,6 @@
-   echo
+ then
+   echo ""
+-  if test -z "$IN_RPM"
+-  then
+-    echo "To start mysqld at boot time you have to copy support-files/mysql.server"
+-    echo "to the right place for your system"
+-    echo
+-  fi
    echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
+   echo "See the manual for instructions."
    echo
 -  if test -z "$IN_RPM"
 -  then
@@ -122,6 +38,6 @@
 -    echo "cd bench ; run-all-tests"
 -    echo
 -  fi
-   echo "You can also try the mysql command line tool with:"
-   echo "@bindir@/mysql test"
+   echo "Please report any problems with the @scriptdir@/mysqlbug script!"
    echo
+   echo "The latest information about MySQL is available on the web at http://www.tcx.se"
diff --git a/databases/mysql60-server/files/patch-af b/databases/mysql60-server/files/patch-af
index e3ba06c5d13..9318e20d9f0 100644
--- a/databases/mysql60-server/files/patch-af
+++ b/databases/mysql60-server/files/patch-af
@@ -1,5 +1,5 @@
---- scripts/safe_mysqld.sh.orig	Wed Oct  7 10:30:58 1998
-+++ scripts/safe_mysqld.sh	Wed Oct 21 15:05:52 1998
+--- scripts/safe_mysqld.sh.orig	Wed Nov  4 13:21:22 1998
++++ scripts/safe_mysqld.sh	Tue Nov 10 16:59:51 1998
 @@ -12,33 +12,9 @@
  
  trap '' 1 2 3 15			# we shouldn't let anyone kill us
@@ -35,10 +35,10 @@
 +DATADIR=@localstatedir@
 +ledir=@libexecdir@
  
- pidfile=$DATADIR/`@HOSTNAME@`.pid
+ pid_file=$DATADIR/`@HOSTNAME@`.pid
  log=$DATADIR/`@HOSTNAME@`.log
-@@ -103,33 +79,6 @@
-   if test ! -f $pidfile			# This is removed if normal shutdown
+@@ -114,33 +90,6 @@
+   if test ! -f $pid_file		# This is removed if normal shutdown
    then
      break;
 -  fi
@@ -50,7 +50,7 @@
 -    # The only thing is ps x => redhat 5 gives warnings when using ps -x.
 -    # kill -9 is used or the proces won't react on the kill.
 -    numofproces=`ps x | grep -v "grep" | grep -c $ledir/mysqld`
--    echo -e "\nNumber of processes running now: $numofproces" | tee -a $err
+-    echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log
 -    I=1
 -    while test "$I" -le "$numofproces"
 -    do 
@@ -62,12 +62,12 @@
 -	#    echo "TEST $I - $T **"
 -	if kill -9 $T
 -	then
--	  echo "mysqld proces hanging, pid $T - killed" | tee -a $err
+-	  echo "mysqld proces hanging, pid $T - killed" | tee -a $err_log
 -	else 
 -	  break
 -	fi
 -	I=`expr $I + 1`
 -    done
    fi
-   echo "mysqld restarted on " `date` | tee -a $err
+   echo "mysqld restarted on " `date` | tee -a $err_log
  done
diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist
index bbab91cd70c..c70cd09daf5 100644
--- a/databases/mysql60-server/pkg-plist
+++ b/databases/mysql60-server/pkg-plist
@@ -8,6 +8,7 @@ bin/make_binary_distribution
 bin/msql2mysql
 bin/mysql
 bin/mysql_install_db
+bin/mysql_setpermisson
 bin/mysql_zap
 bin/mysqlaccess
 bin/mysqladmin
@@ -66,13 +67,9 @@ share/mysql/hungarian/errmsg.txt
 share/mysql/italian/errmsg.sys
 share/mysql/italian/errmsg.txt
 share/mysql/my-example.cnf
-share/mysql/mysql-3.22.9-beta.spec
+share/mysql/mysql-3.22.10-beta.spec
 share/mysql/mysql-log-rotate
 share/mysql/mysql.server
-share/mysql/mysql/db.frm
-share/mysql/mysql/func.frm
-share/mysql/mysql/host.frm
-share/mysql/mysql/user.frm
 share/mysql/norwegian-ny/errmsg.sys
 share/mysql/norwegian-ny/errmsg.txt
 share/mysql/norwegian/errmsg.sys