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 ...

61 files changed, 2594 insertions, 598 deletions

diff --git a/databases/mysql322-client/Makefile b/databases/mysql322-client/Makefile
index a144afd0ba9d..708240ebc2fe 100644
--- a/databases/mysql322-client/Makefile
+++ b/databases/mysql322-client/Makefile
@@ -1,35 +1,63 @@
-# ports collection makefile for:	mySQL
-# Version required:			v3.21.33
-# Date created:				14 Aug 1998
+# ports collection makefile for:	MySQL
+# Version required:			v3.22.6-alpha
+# Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.24 1998/09/01 15:27:36 thepish Exp $
+# $Id$
 #
 
-DISTNAME=	mysql-3.21.33
-PKGNAME=	mysql-3.21.33
+DISTNAME=	mysql-3.22.6-alpha
+PKGNAME=	mysql-3.22.6a
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
-		http://mysql.bluep.com/Downloads/ \
-		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
-		http://www.tcx.se/Downloads/MySQL-3.21/
+MASTER_SITES=	http://mysql.polaris.ca/Downloads/MySQL-3.22/ \
+		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
+		http://www.tcx.se/Downloads/MySQL-3.22/
 
 MAINTAINER=	ibex@physik.TU-Berlin.DE
 
+NO_LATEST_LINK=	yes
 MAN1=		mysql.1
 
-USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
-		--with-MAKE=gmake \
 		--without-perl \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
+		PERL5=${PREFIX}/bin/perl5 \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
+OSVERSION!=	sysctl -n kern.osreldate
+.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
+.else
+CONFIGURE_ARGS+=	--with-mit-threads
+.endif
+
+.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
+	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
+	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "         'mysqladmin shutdown' from working properly."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
+	@${ECHO} "are still to buggy to use with mysql."
+	@${ECHO} "Using mit-pthreads."
+	@${ECHO}
+.endif
+	
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -39,24 +67,29 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	(cd ${WRKSRC};scripts/mysql_install_db)
+	${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
 	@ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh
-	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
+	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh
+
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/mysql
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
 	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
+.endif
+
+	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/databases/mysql322-server/Makefile b/databases/mysql322-server/Makefile
index a144afd0ba9d..708240ebc2fe 100644
--- a/databases/mysql322-server/Makefile
+++ b/databases/mysql322-server/Makefile
@@ -1,35 +1,63 @@
-# ports collection makefile for:	mySQL
-# Version required:			v3.21.33
-# Date created:				14 Aug 1998
+# ports collection makefile for:	MySQL
+# Version required:			v3.22.6-alpha
+# Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.24 1998/09/01 15:27:36 thepish Exp $
+# $Id$
 #
 
-DISTNAME=	mysql-3.21.33
-PKGNAME=	mysql-3.21.33
+DISTNAME=	mysql-3.22.6-alpha
+PKGNAME=	mysql-3.22.6a
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
-		http://mysql.bluep.com/Downloads/ \
-		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
-		http://www.tcx.se/Downloads/MySQL-3.21/
+MASTER_SITES=	http://mysql.polaris.ca/Downloads/MySQL-3.22/ \
+		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
+		http://www.tcx.se/Downloads/MySQL-3.22/
 
 MAINTAINER=	ibex@physik.TU-Berlin.DE
 
+NO_LATEST_LINK=	yes
 MAN1=		mysql.1
 
-USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
-		--with-MAKE=gmake \
 		--without-perl \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
+		PERL5=${PREFIX}/bin/perl5 \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
+OSVERSION!=	sysctl -n kern.osreldate
+.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
+.else
+CONFIGURE_ARGS+=	--with-mit-threads
+.endif
+
+.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
+	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
+	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "         'mysqladmin shutdown' from working properly."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
+	@${ECHO} "are still to buggy to use with mysql."
+	@${ECHO} "Using mit-pthreads."
+	@${ECHO}
+.endif
+	
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -39,24 +67,29 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	(cd ${WRKSRC};scripts/mysql_install_db)
+	${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
 	@ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh
-	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
+	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh
+
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/mysql
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
 	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
+.endif
+
+	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/databases/mysql322-server/distinfo b/databases/mysql322-server/distinfo
index be2d2172b84c..3c563e34508d 100644
--- a/databases/mysql322-server/distinfo
+++ b/databases/mysql322-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.21.33.tar.gz) = 64672bebf05fa95f9772303d3b86e40b
+MD5 (mysql-3.22.6-alpha.tar.gz) = 2bd0e6a7beb21dcb8d6e8b5b5f2b3bc4
diff --git a/databases/mysql322-server/files/patch-ab b/databases/mysql322-server/files/patch-ab
index 6f41ac6a3549..2aa751cd44c6 100644
--- a/databases/mysql322-server/files/patch-ab
+++ b/databases/mysql322-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 <<END_OF_DATA
- # Create tables from the .frm files
-@@ -149,11 +136,7 @@
+@@ -150,9 +115,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');
+-
+ INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
+ INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
+ 
+@@ -160,16 +122,19 @@
+ INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N');
+ 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
+   echo "mysqld demon is running and mysql grant tables are installed."
    echo
    echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
-   echo
+-  echo
 -  echo "You can test the MySQL demon with the benchmarks in the 'bench'"
 -  echo "directory:"
 -  echo "cd bench ; run-all-tests"
--  echo
--  echo "You can also try the mysql command line tool with:"
-+  echo "You can test the MySQL daemon with the mysql command line tool:"
-   echo "@bindir@/mysql test"
    echo
-   echo "Plese report any problems with the @scriptdir@/mysqlbug script!"
+   echo "You can also try the mysql command line tool with:"
+   echo "@bindir@/mysql test"
diff --git a/databases/mysql322-server/files/patch-ac b/databases/mysql322-server/files/patch-ac
index f435e9b7dce7..eb4660bb9e13 100644
--- a/databases/mysql322-server/files/patch-ac
+++ b/databases/mysql322-server/files/patch-ac
@@ -1,20 +1,6 @@
-
-From josh@ican.net Wed Jul  2 17:10:11 1997
-Date: Wed, 2 Jul 1997 17:07:20 -0400
-From: Josh Tiefenbach <josh@ican.net>
-To: James FitzGibbon <james@ican.net>
-Subject: Patch for mysql port
-
-Here. Satoshi will be satisfied
-
--- 
-Josh Tiefenbach - Assistant Gopher - ACC TelEnterprises - josh@ican.net
-
-  [ Part 2: "Attached Text" ]
-
---- mit-pthreads/config/configure.orig	Wed Jul  2 17:06:00 1997
-+++ mit-pthreads/config/configure	Wed Jul  2 17:06:29 1997
-@@ -1246,7 +1246,7 @@
+--- mit-pthreads/config/configure.orig	Tue Mar 10 10:11:25 1998
++++ mit-pthreads/config/configure	Tue Sep  1 10:57:21 1998
+@@ -1280,7 +1280,7 @@
      m68*-*-netbsd*)
  	name=m68000-netbsd
  	;;
@@ -22,4 +8,4 @@ Josh Tiefenbach - Assistant Gopher - ACC TelEnterprises - josh@ican.net
 +    i386-*-freebsd2.* | i386-*-freebsd3.*)
          name=i386-freebsd-2.0
          sysincludes=freebsd-2.0
-         except="fork lseek sigsuspend sigprocmask"
+         except="fork lseek ftruncate sigsuspend sigprocmask"
diff --git a/databases/mysql322-server/files/patch-af b/databases/mysql322-server/files/patch-af
new file mode 100644
index 000000000000..77d9219c4ecb
--- /dev/null
+++ b/databases/mysql322-server/files/patch-af
@@ -0,0 +1,65 @@
+--- scripts/safe_mysqld.sh.orig	Mon Aug 10 16:31:56 1998
++++ scripts/safe_mysqld.sh	Tue Sep  1 11:03:21 1998
+@@ -10,25 +10,9 @@
+ # mysql.server works by first doing a cd to the base directory and from there
+ # executing safe_mysqld
+ 
+-# 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 \
+- -x ./bin/mysqld
+-then
+-  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data is
+-  DATADIR=$MY_BASEDIR_VERSION/data	# Where the databases are
+-  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld are
+-# 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
+-then
+-  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var is
+-  DATADIR=$MY_BASEDIR_VERSION/var	# Where the databases are
+-  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld are
+-else
+-  MY_BASEDIR_VERSION=@prefix@
+-  DATADIR=@localstatedir@
+-  ledir=@libexecdir@
+-fi
++MY_BASEDIR_VERSION=@prefix@
++DATADIR=@localstatedir@
++ledir=@libexecdir@
+ 
+ pidfile=$DATADIR/`@HOSTNAME@`.pid
+ log=$DATADIR/`@HOSTNAME@`.log
+@@ -93,33 +77,6 @@
+   if test ! -f $pidfile			# This is removed if normal shutdown
+   then
+     break;
+-  fi
+-  if @IS_LINUX@
+-  then
+-    # Test if one proces was hanging.
+-    # This is only a fix for Linux (running as base 3 mysqld processes)
+-    # but should work for the rest of the servers.
+-    # 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 $log
+-    I=1
+-    while test "$I" -le "$numofproces"
+-    do 
+-      PROC=`ps x | grep $ledir/mysqld | grep -v "grep" | tail -1` 
+-	for T in $PROC
+-	do
+-	  break
+-	done
+-	#    echo "TEST $I - $T **"
+-	if kill -9 $T
+-	then
+-	  echo "mysqld proces hanging, pid $T - killed" | tee -a $log
+-	else 
+-	  break
+-	fi
+-	I=`expr $I + 1`
+-    done
+   fi
+   echo "mysqld restarted on " `date` | tee -a $log
+ done
diff --git a/databases/mysql322-server/pkg-plist b/databases/mysql322-server/pkg-plist
index 082897879a96..4bcfb3097885 100644
--- a/databases/mysql322-server/pkg-plist
+++ b/databases/mysql322-server/pkg-plist
@@ -1,4 +1,5 @@
 bin/add_file_priv
+bin/add_func_table
 bin/add_long_password
 bin/comp_err
 bin/isamchk
@@ -16,6 +17,7 @@ bin/mysqlimport
 bin/mysqlshow
 bin/perror
 bin/replace
+bin/resolveip
 bin/safe_mysqld
 bin/which1
 bin/zap
@@ -28,6 +30,7 @@ include/mysql/my_sys.h
 include/mysql/mysql.h
 include/mysql/mysql_com.h
 include/mysql/mysql_version.h
+include/mysql/mysqld_error.h
 @unexec install-info --delete %D/info/mysql.info %D/info/dir
 info/mysql.info
 @exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
@@ -36,6 +39,9 @@ lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
 lib/mysql/libmysqlclient.a
+lib/mysql/libmysqlclient.la
+lib/mysql/libmysqlclient.so
+lib/mysql/libmysqlclient.so.4.0
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 lib/mysql/libnisam.a
@@ -56,6 +62,13 @@ share/mysql/french/errmsg.sys
 share/mysql/french/errmsg.txt
 share/mysql/german/errmsg.sys
 share/mysql/german/errmsg.txt
+share/mysql/hungarian/errmsg.sys
+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.6-alpha.spec
+share/mysql/mysql-log-rotate
 share/mysql/mysql/db.frm
 share/mysql/mysql/func.frm
 share/mysql/mysql/host.frm
@@ -82,6 +95,8 @@ share/mysql/swedish/errmsg.txt
 @dirrm share/mysql/english
 @dirrm share/mysql/french
 @dirrm share/mysql/german
+@dirrm share/mysql/hungarian
+@dirrm share/mysql/italian
 @dirrm share/mysql/mysql
 @dirrm share/mysql/norwegian
 @dirrm share/mysql/norwegian-ny
@@ -93,3 +108,5 @@ share/mysql/swedish/errmsg.txt
 @dirrm share/mysql
 @exec %D/bin/mysql_install_db
 @exec /usr/bin/killall mysqld
+@unexec /sbin/ldconfig -R
+@exec /sbin/ldconfig -m %D/lib
diff --git a/databases/mysql323-client/Makefile b/databases/mysql323-client/Makefile
index a144afd0ba9d..708240ebc2fe 100644
--- a/databases/mysql323-client/Makefile
+++ b/databases/mysql323-client/Makefile
@@ -1,35 +1,63 @@
-# ports collection makefile for:	mySQL
-# Version required:			v3.21.33
-# Date created:				14 Aug 1998
+# ports collection makefile for:	MySQL
+# Version required:			v3.22.6-alpha
+# Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.24 1998/09/01 15:27:36 thepish Exp $
+# $Id$
 #
 
-DISTNAME=	mysql-3.21.33
-PKGNAME=	mysql-3.21.33
+DISTNAME=	mysql-3.22.6-alpha
+PKGNAME=	mysql-3.22.6a
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
-		http://mysql.bluep.com/Downloads/ \
-		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
-		http://www.tcx.se/Downloads/MySQL-3.21/
+MASTER_SITES=	http://mysql.polaris.ca/Downloads/MySQL-3.22/ \
+		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
+		http://www.tcx.se/Downloads/MySQL-3.22/
 
 MAINTAINER=	ibex@physik.TU-Berlin.DE
 
+NO_LATEST_LINK=	yes
 MAN1=		mysql.1
 
-USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
-		--with-MAKE=gmake \
 		--without-perl \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
+		PERL5=${PREFIX}/bin/perl5 \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
+OSVERSION!=	sysctl -n kern.osreldate
+.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
+.else
+CONFIGURE_ARGS+=	--with-mit-threads
+.endif
+
+.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
+	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
+	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "         'mysqladmin shutdown' from working properly."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
+	@${ECHO} "are still to buggy to use with mysql."
+	@${ECHO} "Using mit-pthreads."
+	@${ECHO}
+.endif
+	
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -39,24 +67,29 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	(cd ${WRKSRC};scripts/mysql_install_db)
+	${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
 	@ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh
-	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
+	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh
+
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/mysql
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
 	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
+.endif
+
+	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index a144afd0ba9d..708240ebc2fe 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -1,35 +1,63 @@
-# ports collection makefile for:	mySQL
-# Version required:			v3.21.33
-# Date created:				14 Aug 1998
+# ports collection makefile for:	MySQL
+# Version required:			v3.22.6-alpha
+# Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.24 1998/09/01 15:27:36 thepish Exp $
+# $Id$
 #
 
-DISTNAME=	mysql-3.21.33
-PKGNAME=	mysql-3.21.33
+DISTNAME=	mysql-3.22.6-alpha
+PKGNAME=	mysql-3.22.6a
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
-		http://mysql.bluep.com/Downloads/ \
-		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
-		http://www.tcx.se/Downloads/MySQL-3.21/
+MASTER_SITES=	http://mysql.polaris.ca/Downloads/MySQL-3.22/ \
+		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
+		http://www.tcx.se/Downloads/MySQL-3.22/
 
 MAINTAINER=	ibex@physik.TU-Berlin.DE
 
+NO_LATEST_LINK=	yes
 MAN1=		mysql.1
 
-USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
-		--with-MAKE=gmake \
 		--without-perl \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
+		PERL5=${PREFIX}/bin/perl5 \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
+OSVERSION!=	sysctl -n kern.osreldate
+.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
+.else
+CONFIGURE_ARGS+=	--with-mit-threads
+.endif
+
+.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
+	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
+	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "         'mysqladmin shutdown' from working properly."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
+	@${ECHO} "are still to buggy to use with mysql."
+	@${ECHO} "Using mit-pthreads."
+	@${ECHO}
+.endif
+	
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -39,24 +67,29 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	(cd ${WRKSRC};scripts/mysql_install_db)
+	${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
 	@ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh
-	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
+	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh
+
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/mysql
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
 	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
+.endif
+
+	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/databases/mysql323-server/distinfo b/databases/mysql323-server/distinfo
index be2d2172b84c..3c563e34508d 100644
--- a/databases/mysql323-server/distinfo
+++ b/databases/mysql323-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.21.33.tar.gz) = 64672bebf05fa95f9772303d3b86e40b
+MD5 (mysql-3.22.6-alpha.tar.gz) = 2bd0e6a7beb21dcb8d6e8b5b5f2b3bc4
diff --git a/databases/mysql323-server/files/patch-ab b/databases/mysql323-server/files/patch-ab
index 6f41ac6a3549..2aa751cd44c6 100644
--- a/databases/mysql323-server/files/patch-ab
+++ b/databases/mysql323-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 <<END_OF_DATA
- # Create tables from the .frm files
-@@ -149,11 +136,7 @@
+@@ -150,9 +115,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');
+-
+ INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
+ INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
+ 
+@@ -160,16 +122,19 @@
+ INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N');
+ 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
+   echo "mysqld demon is running and mysql grant tables are installed."
    echo
    echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
-   echo
+-  echo
 -  echo "You can test the MySQL demon with the benchmarks in the 'bench'"
 -  echo "directory:"
 -  echo "cd bench ; run-all-tests"
--  echo
--  echo "You can also try the mysql command line tool with:"
-+  echo "You can test the MySQL daemon with the mysql command line tool:"
-   echo "@bindir@/mysql test"
    echo
-   echo "Plese report any problems with the @scriptdir@/mysqlbug script!"
+   echo "You can also try the mysql command line tool with:"
+   echo "@bindir@/mysql test"
diff --git a/databases/mysql323-server/files/patch-af b/databases/mysql323-server/files/patch-af
new file mode 100644
index 000000000000..77d9219c4ecb
--- /dev/null
+++ b/databases/mysql323-server/files/patch-af
@@ -0,0 +1,65 @@
+--- scripts/safe_mysqld.sh.orig	Mon Aug 10 16:31:56 1998
++++ scripts/safe_mysqld.sh	Tue Sep  1 11:03:21 1998
+@@ -10,25 +10,9 @@
+ # mysql.server works by first doing a cd to the base directory and from there
+ # executing safe_mysqld
+ 
+-# 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 \
+- -x ./bin/mysqld
+-then
+-  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data is
+-  DATADIR=$MY_BASEDIR_VERSION/data	# Where the databases are
+-  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld are
+-# 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
+-then
+-  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var is
+-  DATADIR=$MY_BASEDIR_VERSION/var	# Where the databases are
+-  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld are
+-else
+-  MY_BASEDIR_VERSION=@prefix@
+-  DATADIR=@localstatedir@
+-  ledir=@libexecdir@
+-fi
++MY_BASEDIR_VERSION=@prefix@
++DATADIR=@localstatedir@
++ledir=@libexecdir@
+ 
+ pidfile=$DATADIR/`@HOSTNAME@`.pid
+ log=$DATADIR/`@HOSTNAME@`.log
+@@ -93,33 +77,6 @@
+   if test ! -f $pidfile			# This is removed if normal shutdown
+   then
+     break;
+-  fi
+-  if @IS_LINUX@
+-  then
+-    # Test if one proces was hanging.
+-    # This is only a fix for Linux (running as base 3 mysqld processes)
+-    # but should work for the rest of the servers.
+-    # 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 $log
+-    I=1
+-    while test "$I" -le "$numofproces"
+-    do 
+-      PROC=`ps x | grep $ledir/mysqld | grep -v "grep" | tail -1` 
+-	for T in $PROC
+-	do
+-	  break
+-	done
+-	#    echo "TEST $I - $T **"
+-	if kill -9 $T
+-	then
+-	  echo "mysqld proces hanging, pid $T - killed" | tee -a $log
+-	else 
+-	  break
+-	fi
+-	I=`expr $I + 1`
+-    done
+   fi
+   echo "mysqld restarted on " `date` | tee -a $log
+ done
diff --git a/databases/mysql323-server/pkg-plist b/databases/mysql323-server/pkg-plist
index 082897879a96..4bcfb3097885 100644
--- a/databases/mysql323-server/pkg-plist
+++ b/databases/mysql323-server/pkg-plist
@@ -1,4 +1,5 @@
 bin/add_file_priv
+bin/add_func_table
 bin/add_long_password
 bin/comp_err
 bin/isamchk
@@ -16,6 +17,7 @@ bin/mysqlimport
 bin/mysqlshow
 bin/perror
 bin/replace
+bin/resolveip
 bin/safe_mysqld
 bin/which1
 bin/zap
@@ -28,6 +30,7 @@ include/mysql/my_sys.h
 include/mysql/mysql.h
 include/mysql/mysql_com.h
 include/mysql/mysql_version.h
+include/mysql/mysqld_error.h
 @unexec install-info --delete %D/info/mysql.info %D/info/dir
 info/mysql.info
 @exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
@@ -36,6 +39,9 @@ lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
 lib/mysql/libmysqlclient.a
+lib/mysql/libmysqlclient.la
+lib/mysql/libmysqlclient.so
+lib/mysql/libmysqlclient.so.4.0
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 lib/mysql/libnisam.a
@@ -56,6 +62,13 @@ share/mysql/french/errmsg.sys
 share/mysql/french/errmsg.txt
 share/mysql/german/errmsg.sys
 share/mysql/german/errmsg.txt
+share/mysql/hungarian/errmsg.sys
+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.6-alpha.spec
+share/mysql/mysql-log-rotate
 share/mysql/mysql/db.frm
 share/mysql/mysql/func.frm
 share/mysql/mysql/host.frm
@@ -82,6 +95,8 @@ share/mysql/swedish/errmsg.txt
 @dirrm share/mysql/english
 @dirrm share/mysql/french
 @dirrm share/mysql/german
+@dirrm share/mysql/hungarian
+@dirrm share/mysql/italian
 @dirrm share/mysql/mysql
 @dirrm share/mysql/norwegian
 @dirrm share/mysql/norwegian-ny
@@ -93,3 +108,5 @@ share/mysql/swedish/errmsg.txt
 @dirrm share/mysql
 @exec %D/bin/mysql_install_db
 @exec /usr/bin/killall mysqld
+@unexec /sbin/ldconfig -R
+@exec /sbin/ldconfig -m %D/lib
diff --git a/databases/mysql40-client/Makefile b/databases/mysql40-client/Makefile
index a144afd0ba9d..708240ebc2fe 100644
--- a/databases/mysql40-client/Makefile
+++ b/databases/mysql40-client/Makefile
@@ -1,35 +1,63 @@
-# ports collection makefile for:	mySQL
-# Version required:			v3.21.33
-# Date created:				14 Aug 1998
+# ports collection makefile for:	MySQL
+# Version required:			v3.22.6-alpha
+# Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.24 1998/09/01 15:27:36 thepish Exp $
+# $Id$
 #
 
-DISTNAME=	mysql-3.21.33
-PKGNAME=	mysql-3.21.33
+DISTNAME=	mysql-3.22.6-alpha
+PKGNAME=	mysql-3.22.6a
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
-		http://mysql.bluep.com/Downloads/ \
-		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
-		http://www.tcx.se/Downloads/MySQL-3.21/
+MASTER_SITES=	http://mysql.polaris.ca/Downloads/MySQL-3.22/ \
+		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
+		http://www.tcx.se/Downloads/MySQL-3.22/
 
 MAINTAINER=	ibex@physik.TU-Berlin.DE
 
+NO_LATEST_LINK=	yes
 MAN1=		mysql.1
 
-USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
-		--with-MAKE=gmake \
 		--without-perl \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
+		PERL5=${PREFIX}/bin/perl5 \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
+OSVERSION!=	sysctl -n kern.osreldate
+.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
+.else
+CONFIGURE_ARGS+=	--with-mit-threads
+.endif
+
+.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
+	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
+	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "         'mysqladmin shutdown' from working properly."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
+	@${ECHO} "are still to buggy to use with mysql."
+	@${ECHO} "Using mit-pthreads."
+	@${ECHO}
+.endif
+	
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -39,24 +67,29 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	(cd ${WRKSRC};scripts/mysql_install_db)
+	${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
 	@ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh
-	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
+	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh
+
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/mysql
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
 	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
+.endif
+
+	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index a144afd0ba9d..708240ebc2fe 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -1,35 +1,63 @@
-# ports collection makefile for:	mySQL
-# Version required:			v3.21.33
-# Date created:				14 Aug 1998
+# ports collection makefile for:	MySQL
+# Version required:			v3.22.6-alpha
+# Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.24 1998/09/01 15:27:36 thepish Exp $
+# $Id$
 #
 
-DISTNAME=	mysql-3.21.33
-PKGNAME=	mysql-3.21.33
+DISTNAME=	mysql-3.22.6-alpha
+PKGNAME=	mysql-3.22.6a
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
-		http://mysql.bluep.com/Downloads/ \
-		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
-		http://www.tcx.se/Downloads/MySQL-3.21/
+MASTER_SITES=	http://mysql.polaris.ca/Downloads/MySQL-3.22/ \
+		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
+		http://www.tcx.se/Downloads/MySQL-3.22/
 
 MAINTAINER=	ibex@physik.TU-Berlin.DE
 
+NO_LATEST_LINK=	yes
 MAN1=		mysql.1
 
-USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
-		--with-MAKE=gmake \
 		--without-perl \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
+		PERL5=${PREFIX}/bin/perl5 \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
+OSVERSION!=	sysctl -n kern.osreldate
+.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
+.else
+CONFIGURE_ARGS+=	--with-mit-threads
+.endif
+
+.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
+	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
+	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "         'mysqladmin shutdown' from working properly."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
+	@${ECHO} "are still to buggy to use with mysql."
+	@${ECHO} "Using mit-pthreads."
+	@${ECHO}
+.endif
+	
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -39,24 +67,29 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	(cd ${WRKSRC};scripts/mysql_install_db)
+	${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
 	@ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh
-	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
+	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh
+
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/mysql
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
 	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
+.endif
+
+	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/databases/mysql40-server/distinfo b/databases/mysql40-server/distinfo
index be2d2172b84c..3c563e34508d 100644
--- a/databases/mysql40-server/distinfo
+++ b/databases/mysql40-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.21.33.tar.gz) = 64672bebf05fa95f9772303d3b86e40b
+MD5 (mysql-3.22.6-alpha.tar.gz) = 2bd0e6a7beb21dcb8d6e8b5b5f2b3bc4
diff --git a/databases/mysql40-server/files/patch-ab b/databases/mysql40-server/files/patch-ab
index 6f41ac6a3549..2aa751cd44c6 100644
--- a/databases/mysql40-server/files/patch-ab
+++ b/databases/mysql40-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 <<END_OF_DATA
- # Create tables from the .frm files
-@@ -149,11 +136,7 @@
+@@ -150,9 +115,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');
+-
+ INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
+ INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
+ 
+@@ -160,16 +122,19 @@
+ INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N');
+ 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
+   echo "mysqld demon is running and mysql grant tables are installed."
    echo
    echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
-   echo
+-  echo
 -  echo "You can test the MySQL demon with the benchmarks in the 'bench'"
 -  echo "directory:"
 -  echo "cd bench ; run-all-tests"
--  echo
--  echo "You can also try the mysql command line tool with:"
-+  echo "You can test the MySQL daemon with the mysql command line tool:"
-   echo "@bindir@/mysql test"
    echo
-   echo "Plese report any problems with the @scriptdir@/mysqlbug script!"
+   echo "You can also try the mysql command line tool with:"
+   echo "@bindir@/mysql test"
diff --git a/databases/mysql40-server/files/patch-af b/databases/mysql40-server/files/patch-af
new file mode 100644
index 000000000000..77d9219c4ecb
--- /dev/null
+++ b/databases/mysql40-server/files/patch-af
@@ -0,0 +1,65 @@
+--- scripts/safe_mysqld.sh.orig	Mon Aug 10 16:31:56 1998
++++ scripts/safe_mysqld.sh	Tue Sep  1 11:03:21 1998
+@@ -10,25 +10,9 @@
+ # mysql.server works by first doing a cd to the base directory and from there
+ # executing safe_mysqld
+ 
+-# 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 \
+- -x ./bin/mysqld
+-then
+-  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data is
+-  DATADIR=$MY_BASEDIR_VERSION/data	# Where the databases are
+-  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld are
+-# 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
+-then
+-  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var is
+-  DATADIR=$MY_BASEDIR_VERSION/var	# Where the databases are
+-  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld are
+-else
+-  MY_BASEDIR_VERSION=@prefix@
+-  DATADIR=@localstatedir@
+-  ledir=@libexecdir@
+-fi
++MY_BASEDIR_VERSION=@prefix@
++DATADIR=@localstatedir@
++ledir=@libexecdir@
+ 
+ pidfile=$DATADIR/`@HOSTNAME@`.pid
+ log=$DATADIR/`@HOSTNAME@`.log
+@@ -93,33 +77,6 @@
+   if test ! -f $pidfile			# This is removed if normal shutdown
+   then
+     break;
+-  fi
+-  if @IS_LINUX@
+-  then
+-    # Test if one proces was hanging.
+-    # This is only a fix for Linux (running as base 3 mysqld processes)
+-    # but should work for the rest of the servers.
+-    # 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 $log
+-    I=1
+-    while test "$I" -le "$numofproces"
+-    do 
+-      PROC=`ps x | grep $ledir/mysqld | grep -v "grep" | tail -1` 
+-	for T in $PROC
+-	do
+-	  break
+-	done
+-	#    echo "TEST $I - $T **"
+-	if kill -9 $T
+-	then
+-	  echo "mysqld proces hanging, pid $T - killed" | tee -a $log
+-	else 
+-	  break
+-	fi
+-	I=`expr $I + 1`
+-    done
+   fi
+   echo "mysqld restarted on " `date` | tee -a $log
+ done
diff --git a/databases/mysql40-server/pkg-plist b/databases/mysql40-server/pkg-plist
index 082897879a96..4bcfb3097885 100644
--- a/databases/mysql40-server/pkg-plist
+++ b/databases/mysql40-server/pkg-plist
@@ -1,4 +1,5 @@
 bin/add_file_priv
+bin/add_func_table
 bin/add_long_password
 bin/comp_err
 bin/isamchk
@@ -16,6 +17,7 @@ bin/mysqlimport
 bin/mysqlshow
 bin/perror
 bin/replace
+bin/resolveip
 bin/safe_mysqld
 bin/which1
 bin/zap
@@ -28,6 +30,7 @@ include/mysql/my_sys.h
 include/mysql/mysql.h
 include/mysql/mysql_com.h
 include/mysql/mysql_version.h
+include/mysql/mysqld_error.h
 @unexec install-info --delete %D/info/mysql.info %D/info/dir
 info/mysql.info
 @exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
@@ -36,6 +39,9 @@ lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
 lib/mysql/libmysqlclient.a
+lib/mysql/libmysqlclient.la
+lib/mysql/libmysqlclient.so
+lib/mysql/libmysqlclient.so.4.0
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 lib/mysql/libnisam.a
@@ -56,6 +62,13 @@ share/mysql/french/errmsg.sys
 share/mysql/french/errmsg.txt
 share/mysql/german/errmsg.sys
 share/mysql/german/errmsg.txt
+share/mysql/hungarian/errmsg.sys
+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.6-alpha.spec
+share/mysql/mysql-log-rotate
 share/mysql/mysql/db.frm
 share/mysql/mysql/func.frm
 share/mysql/mysql/host.frm
@@ -82,6 +95,8 @@ share/mysql/swedish/errmsg.txt
 @dirrm share/mysql/english
 @dirrm share/mysql/french
 @dirrm share/mysql/german
+@dirrm share/mysql/hungarian
+@dirrm share/mysql/italian
 @dirrm share/mysql/mysql
 @dirrm share/mysql/norwegian
 @dirrm share/mysql/norwegian-ny
@@ -93,3 +108,5 @@ share/mysql/swedish/errmsg.txt
 @dirrm share/mysql
 @exec %D/bin/mysql_install_db
 @exec /usr/bin/killall mysqld
+@unexec /sbin/ldconfig -R
+@exec /sbin/ldconfig -m %D/lib
diff --git a/databases/mysql41-client/Makefile b/databases/mysql41-client/Makefile
index a144afd0ba9d..708240ebc2fe 100644
--- a/databases/mysql41-client/Makefile
+++ b/databases/mysql41-client/Makefile
@@ -1,35 +1,63 @@
-# ports collection makefile for:	mySQL
-# Version required:			v3.21.33
-# Date created:				14 Aug 1998
+# ports collection makefile for:	MySQL
+# Version required:			v3.22.6-alpha
+# Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.24 1998/09/01 15:27:36 thepish Exp $
+# $Id$
 #
 
-DISTNAME=	mysql-3.21.33
-PKGNAME=	mysql-3.21.33
+DISTNAME=	mysql-3.22.6-alpha
+PKGNAME=	mysql-3.22.6a
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
-		http://mysql.bluep.com/Downloads/ \
-		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
-		http://www.tcx.se/Downloads/MySQL-3.21/
+MASTER_SITES=	http://mysql.polaris.ca/Downloads/MySQL-3.22/ \
+		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
+		http://www.tcx.se/Downloads/MySQL-3.22/
 
 MAINTAINER=	ibex@physik.TU-Berlin.DE
 
+NO_LATEST_LINK=	yes
 MAN1=		mysql.1
 
-USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
-		--with-MAKE=gmake \
 		--without-perl \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
+		PERL5=${PREFIX}/bin/perl5 \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
+OSVERSION!=	sysctl -n kern.osreldate
+.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
+.else
+CONFIGURE_ARGS+=	--with-mit-threads
+.endif
+
+.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
+	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
+	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "         'mysqladmin shutdown' from working properly."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
+	@${ECHO} "are still to buggy to use with mysql."
+	@${ECHO} "Using mit-pthreads."
+	@${ECHO}
+.endif
+	
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -39,24 +67,29 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	(cd ${WRKSRC};scripts/mysql_install_db)
+	${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
 	@ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh
-	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
+	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh
+
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/mysql
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
 	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
+.endif
+
+	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index a144afd0ba9d..708240ebc2fe 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -1,35 +1,63 @@
-# ports collection makefile for:	mySQL
-# Version required:			v3.21.33
-# Date created:				14 Aug 1998
+# ports collection makefile for:	MySQL
+# Version required:			v3.22.6-alpha
+# Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.24 1998/09/01 15:27:36 thepish Exp $
+# $Id$
 #
 
-DISTNAME=	mysql-3.21.33
-PKGNAME=	mysql-3.21.33
+DISTNAME=	mysql-3.22.6-alpha
+PKGNAME=	mysql-3.22.6a
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
-		http://mysql.bluep.com/Downloads/ \
-		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
-		http://www.tcx.se/Downloads/MySQL-3.21/
+MASTER_SITES=	http://mysql.polaris.ca/Downloads/MySQL-3.22/ \
+		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
+		http://www.tcx.se/Downloads/MySQL-3.22/
 
 MAINTAINER=	ibex@physik.TU-Berlin.DE
 
+NO_LATEST_LINK=	yes
 MAN1=		mysql.1
 
-USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
-		--with-MAKE=gmake \
 		--without-perl \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
+		PERL5=${PREFIX}/bin/perl5 \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
+OSVERSION!=	sysctl -n kern.osreldate
+.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
+.else
+CONFIGURE_ARGS+=	--with-mit-threads
+.endif
+
+.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
+	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
+	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "         'mysqladmin shutdown' from working properly."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
+	@${ECHO} "are still to buggy to use with mysql."
+	@${ECHO} "Using mit-pthreads."
+	@${ECHO}
+.endif
+	
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -39,24 +67,29 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	(cd ${WRKSRC};scripts/mysql_install_db)
+	${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
 	@ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh
-	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
+	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh
+
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/mysql
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
 	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
+.endif
+
+	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/databases/mysql41-server/distinfo b/databases/mysql41-server/distinfo
index be2d2172b84c..3c563e34508d 100644
--- a/databases/mysql41-server/distinfo
+++ b/databases/mysql41-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.21.33.tar.gz) = 64672bebf05fa95f9772303d3b86e40b
+MD5 (mysql-3.22.6-alpha.tar.gz) = 2bd0e6a7beb21dcb8d6e8b5b5f2b3bc4
diff --git a/databases/mysql41-server/files/patch-ab b/databases/mysql41-server/files/patch-ab
index 6f41ac6a3549..2aa751cd44c6 100644
--- a/databases/mysql41-server/files/patch-ab
+++ b/databases/mysql41-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 <<END_OF_DATA
- # Create tables from the .frm files
-@@ -149,11 +136,7 @@
+@@ -150,9 +115,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');
+-
+ INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
+ INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
+ 
+@@ -160,16 +122,19 @@
+ INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N');
+ 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
+   echo "mysqld demon is running and mysql grant tables are installed."
    echo
    echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
-   echo
+-  echo
 -  echo "You can test the MySQL demon with the benchmarks in the 'bench'"
 -  echo "directory:"
 -  echo "cd bench ; run-all-tests"
--  echo
--  echo "You can also try the mysql command line tool with:"
-+  echo "You can test the MySQL daemon with the mysql command line tool:"
-   echo "@bindir@/mysql test"
    echo
-   echo "Plese report any problems with the @scriptdir@/mysqlbug script!"
+   echo "You can also try the mysql command line tool with:"
+   echo "@bindir@/mysql test"
diff --git a/databases/mysql41-server/files/patch-af b/databases/mysql41-server/files/patch-af
new file mode 100644
index 000000000000..77d9219c4ecb
--- /dev/null
+++ b/databases/mysql41-server/files/patch-af
@@ -0,0 +1,65 @@
+--- scripts/safe_mysqld.sh.orig	Mon Aug 10 16:31:56 1998
++++ scripts/safe_mysqld.sh	Tue Sep  1 11:03:21 1998
+@@ -10,25 +10,9 @@
+ # mysql.server works by first doing a cd to the base directory and from there
+ # executing safe_mysqld
+ 
+-# 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 \
+- -x ./bin/mysqld
+-then
+-  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data is
+-  DATADIR=$MY_BASEDIR_VERSION/data	# Where the databases are
+-  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld are
+-# 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
+-then
+-  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var is
+-  DATADIR=$MY_BASEDIR_VERSION/var	# Where the databases are
+-  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld are
+-else
+-  MY_BASEDIR_VERSION=@prefix@
+-  DATADIR=@localstatedir@
+-  ledir=@libexecdir@
+-fi
++MY_BASEDIR_VERSION=@prefix@
++DATADIR=@localstatedir@
++ledir=@libexecdir@
+ 
+ pidfile=$DATADIR/`@HOSTNAME@`.pid
+ log=$DATADIR/`@HOSTNAME@`.log
+@@ -93,33 +77,6 @@
+   if test ! -f $pidfile			# This is removed if normal shutdown
+   then
+     break;
+-  fi
+-  if @IS_LINUX@
+-  then
+-    # Test if one proces was hanging.
+-    # This is only a fix for Linux (running as base 3 mysqld processes)
+-    # but should work for the rest of the servers.
+-    # 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 $log
+-    I=1
+-    while test "$I" -le "$numofproces"
+-    do 
+-      PROC=`ps x | grep $ledir/mysqld | grep -v "grep" | tail -1` 
+-	for T in $PROC
+-	do
+-	  break
+-	done
+-	#    echo "TEST $I - $T **"
+-	if kill -9 $T
+-	then
+-	  echo "mysqld proces hanging, pid $T - killed" | tee -a $log
+-	else 
+-	  break
+-	fi
+-	I=`expr $I + 1`
+-    done
+   fi
+   echo "mysqld restarted on " `date` | tee -a $log
+ done
diff --git a/databases/mysql41-server/pkg-plist b/databases/mysql41-server/pkg-plist
index 082897879a96..4bcfb3097885 100644
--- a/databases/mysql41-server/pkg-plist
+++ b/databases/mysql41-server/pkg-plist
@@ -1,4 +1,5 @@
 bin/add_file_priv
+bin/add_func_table
 bin/add_long_password
 bin/comp_err
 bin/isamchk
@@ -16,6 +17,7 @@ bin/mysqlimport
 bin/mysqlshow
 bin/perror
 bin/replace
+bin/resolveip
 bin/safe_mysqld
 bin/which1
 bin/zap
@@ -28,6 +30,7 @@ include/mysql/my_sys.h
 include/mysql/mysql.h
 include/mysql/mysql_com.h
 include/mysql/mysql_version.h
+include/mysql/mysqld_error.h
 @unexec install-info --delete %D/info/mysql.info %D/info/dir
 info/mysql.info
 @exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
@@ -36,6 +39,9 @@ lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
 lib/mysql/libmysqlclient.a
+lib/mysql/libmysqlclient.la
+lib/mysql/libmysqlclient.so
+lib/mysql/libmysqlclient.so.4.0
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 lib/mysql/libnisam.a
@@ -56,6 +62,13 @@ share/mysql/french/errmsg.sys
 share/mysql/french/errmsg.txt
 share/mysql/german/errmsg.sys
 share/mysql/german/errmsg.txt
+share/mysql/hungarian/errmsg.sys
+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.6-alpha.spec
+share/mysql/mysql-log-rotate
 share/mysql/mysql/db.frm
 share/mysql/mysql/func.frm
 share/mysql/mysql/host.frm
@@ -82,6 +95,8 @@ share/mysql/swedish/errmsg.txt
 @dirrm share/mysql/english
 @dirrm share/mysql/french
 @dirrm share/mysql/german
+@dirrm share/mysql/hungarian
+@dirrm share/mysql/italian
 @dirrm share/mysql/mysql
 @dirrm share/mysql/norwegian
 @dirrm share/mysql/norwegian-ny
@@ -93,3 +108,5 @@ share/mysql/swedish/errmsg.txt
 @dirrm share/mysql
 @exec %D/bin/mysql_install_db
 @exec /usr/bin/killall mysqld
+@unexec /sbin/ldconfig -R
+@exec /sbin/ldconfig -m %D/lib
diff --git a/databases/mysql50-client/Makefile b/databases/mysql50-client/Makefile
index a144afd0ba9d..708240ebc2fe 100644
--- a/databases/mysql50-client/Makefile
+++ b/databases/mysql50-client/Makefile
@@ -1,35 +1,63 @@
-# ports collection makefile for:	mySQL
-# Version required:			v3.21.33
-# Date created:				14 Aug 1998
+# ports collection makefile for:	MySQL
+# Version required:			v3.22.6-alpha
+# Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.24 1998/09/01 15:27:36 thepish Exp $
+# $Id$
 #
 
-DISTNAME=	mysql-3.21.33
-PKGNAME=	mysql-3.21.33
+DISTNAME=	mysql-3.22.6-alpha
+PKGNAME=	mysql-3.22.6a
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
-		http://mysql.bluep.com/Downloads/ \
-		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
-		http://www.tcx.se/Downloads/MySQL-3.21/
+MASTER_SITES=	http://mysql.polaris.ca/Downloads/MySQL-3.22/ \
+		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
+		http://www.tcx.se/Downloads/MySQL-3.22/
 
 MAINTAINER=	ibex@physik.TU-Berlin.DE
 
+NO_LATEST_LINK=	yes
 MAN1=		mysql.1
 
-USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
-		--with-MAKE=gmake \
 		--without-perl \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
+		PERL5=${PREFIX}/bin/perl5 \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
+OSVERSION!=	sysctl -n kern.osreldate
+.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
+.else
+CONFIGURE_ARGS+=	--with-mit-threads
+.endif
+
+.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
+	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
+	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "         'mysqladmin shutdown' from working properly."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
+	@${ECHO} "are still to buggy to use with mysql."
+	@${ECHO} "Using mit-pthreads."
+	@${ECHO}
+.endif
+	
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -39,24 +67,29 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	(cd ${WRKSRC};scripts/mysql_install_db)
+	${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
 	@ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh
-	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
+	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh
+
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/mysql
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
 	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
+.endif
+
+	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index a144afd0ba9d..708240ebc2fe 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -1,35 +1,63 @@
-# ports collection makefile for:	mySQL
-# Version required:			v3.21.33
-# Date created:				14 Aug 1998
+# ports collection makefile for:	MySQL
+# Version required:			v3.22.6-alpha
+# Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.24 1998/09/01 15:27:36 thepish Exp $
+# $Id$
 #
 
-DISTNAME=	mysql-3.21.33
-PKGNAME=	mysql-3.21.33
+DISTNAME=	mysql-3.22.6-alpha
+PKGNAME=	mysql-3.22.6a
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
-		http://mysql.bluep.com/Downloads/ \
-		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
-		http://www.tcx.se/Downloads/MySQL-3.21/
+MASTER_SITES=	http://mysql.polaris.ca/Downloads/MySQL-3.22/ \
+		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
+		http://www.tcx.se/Downloads/MySQL-3.22/
 
 MAINTAINER=	ibex@physik.TU-Berlin.DE
 
+NO_LATEST_LINK=	yes
 MAN1=		mysql.1
 
-USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
-		--with-MAKE=gmake \
 		--without-perl \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
+		PERL5=${PREFIX}/bin/perl5 \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
+OSVERSION!=	sysctl -n kern.osreldate
+.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
+.else
+CONFIGURE_ARGS+=	--with-mit-threads
+.endif
+
+.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
+	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
+	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "         'mysqladmin shutdown' from working properly."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
+	@${ECHO} "are still to buggy to use with mysql."
+	@${ECHO} "Using mit-pthreads."
+	@${ECHO}
+.endif
+	
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -39,24 +67,29 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	(cd ${WRKSRC};scripts/mysql_install_db)
+	${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
 	@ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh
-	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
+	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh
+
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/mysql
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
 	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
+.endif
+
+	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/databases/mysql50-server/distinfo b/databases/mysql50-server/distinfo
index be2d2172b84c..3c563e34508d 100644
--- a/databases/mysql50-server/distinfo
+++ b/databases/mysql50-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.21.33.tar.gz) = 64672bebf05fa95f9772303d3b86e40b
+MD5 (mysql-3.22.6-alpha.tar.gz) = 2bd0e6a7beb21dcb8d6e8b5b5f2b3bc4
diff --git a/databases/mysql50-server/files/patch-ab b/databases/mysql50-server/files/patch-ab
index 6f41ac6a3549..2aa751cd44c6 100644
--- a/databases/mysql50-server/files/patch-ab
+++ b/databases/mysql50-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 <<END_OF_DATA
- # Create tables from the .frm files
-@@ -149,11 +136,7 @@
+@@ -150,9 +115,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');
+-
+ INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
+ INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
+ 
+@@ -160,16 +122,19 @@
+ INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N');
+ 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
+   echo "mysqld demon is running and mysql grant tables are installed."
    echo
    echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
-   echo
+-  echo
 -  echo "You can test the MySQL demon with the benchmarks in the 'bench'"
 -  echo "directory:"
 -  echo "cd bench ; run-all-tests"
--  echo
--  echo "You can also try the mysql command line tool with:"
-+  echo "You can test the MySQL daemon with the mysql command line tool:"
-   echo "@bindir@/mysql test"
    echo
-   echo "Plese report any problems with the @scriptdir@/mysqlbug script!"
+   echo "You can also try the mysql command line tool with:"
+   echo "@bindir@/mysql test"
diff --git a/databases/mysql50-server/files/patch-af b/databases/mysql50-server/files/patch-af
new file mode 100644
index 000000000000..77d9219c4ecb
--- /dev/null
+++ b/databases/mysql50-server/files/patch-af
@@ -0,0 +1,65 @@
+--- scripts/safe_mysqld.sh.orig	Mon Aug 10 16:31:56 1998
++++ scripts/safe_mysqld.sh	Tue Sep  1 11:03:21 1998
+@@ -10,25 +10,9 @@
+ # mysql.server works by first doing a cd to the base directory and from there
+ # executing safe_mysqld
+ 
+-# 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 \
+- -x ./bin/mysqld
+-then
+-  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data is
+-  DATADIR=$MY_BASEDIR_VERSION/data	# Where the databases are
+-  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld are
+-# 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
+-then
+-  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var is
+-  DATADIR=$MY_BASEDIR_VERSION/var	# Where the databases are
+-  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld are
+-else
+-  MY_BASEDIR_VERSION=@prefix@
+-  DATADIR=@localstatedir@
+-  ledir=@libexecdir@
+-fi
++MY_BASEDIR_VERSION=@prefix@
++DATADIR=@localstatedir@
++ledir=@libexecdir@
+ 
+ pidfile=$DATADIR/`@HOSTNAME@`.pid
+ log=$DATADIR/`@HOSTNAME@`.log
+@@ -93,33 +77,6 @@
+   if test ! -f $pidfile			# This is removed if normal shutdown
+   then
+     break;
+-  fi
+-  if @IS_LINUX@
+-  then
+-    # Test if one proces was hanging.
+-    # This is only a fix for Linux (running as base 3 mysqld processes)
+-    # but should work for the rest of the servers.
+-    # 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 $log
+-    I=1
+-    while test "$I" -le "$numofproces"
+-    do 
+-      PROC=`ps x | grep $ledir/mysqld | grep -v "grep" | tail -1` 
+-	for T in $PROC
+-	do
+-	  break
+-	done
+-	#    echo "TEST $I - $T **"
+-	if kill -9 $T
+-	then
+-	  echo "mysqld proces hanging, pid $T - killed" | tee -a $log
+-	else 
+-	  break
+-	fi
+-	I=`expr $I + 1`
+-    done
+   fi
+   echo "mysqld restarted on " `date` | tee -a $log
+ done
diff --git a/databases/mysql50-server/pkg-plist b/databases/mysql50-server/pkg-plist
index 082897879a96..4bcfb3097885 100644
--- a/databases/mysql50-server/pkg-plist
+++ b/databases/mysql50-server/pkg-plist
@@ -1,4 +1,5 @@
 bin/add_file_priv
+bin/add_func_table
 bin/add_long_password
 bin/comp_err
 bin/isamchk
@@ -16,6 +17,7 @@ bin/mysqlimport
 bin/mysqlshow
 bin/perror
 bin/replace
+bin/resolveip
 bin/safe_mysqld
 bin/which1
 bin/zap
@@ -28,6 +30,7 @@ include/mysql/my_sys.h
 include/mysql/mysql.h
 include/mysql/mysql_com.h
 include/mysql/mysql_version.h
+include/mysql/mysqld_error.h
 @unexec install-info --delete %D/info/mysql.info %D/info/dir
 info/mysql.info
 @exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
@@ -36,6 +39,9 @@ lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
 lib/mysql/libmysqlclient.a
+lib/mysql/libmysqlclient.la
+lib/mysql/libmysqlclient.so
+lib/mysql/libmysqlclient.so.4.0
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 lib/mysql/libnisam.a
@@ -56,6 +62,13 @@ share/mysql/french/errmsg.sys
 share/mysql/french/errmsg.txt
 share/mysql/german/errmsg.sys
 share/mysql/german/errmsg.txt
+share/mysql/hungarian/errmsg.sys
+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.6-alpha.spec
+share/mysql/mysql-log-rotate
 share/mysql/mysql/db.frm
 share/mysql/mysql/func.frm
 share/mysql/mysql/host.frm
@@ -82,6 +95,8 @@ share/mysql/swedish/errmsg.txt
 @dirrm share/mysql/english
 @dirrm share/mysql/french
 @dirrm share/mysql/german
+@dirrm share/mysql/hungarian
+@dirrm share/mysql/italian
 @dirrm share/mysql/mysql
 @dirrm share/mysql/norwegian
 @dirrm share/mysql/norwegian-ny
@@ -93,3 +108,5 @@ share/mysql/swedish/errmsg.txt
 @dirrm share/mysql
 @exec %D/bin/mysql_install_db
 @exec /usr/bin/killall mysqld
+@unexec /sbin/ldconfig -R
+@exec /sbin/ldconfig -m %D/lib
diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile
index a144afd0ba9d..708240ebc2fe 100644
--- a/databases/mysql51-client/Makefile
+++ b/databases/mysql51-client/Makefile
@@ -1,35 +1,63 @@
-# ports collection makefile for:	mySQL
-# Version required:			v3.21.33
-# Date created:				14 Aug 1998
+# ports collection makefile for:	MySQL
+# Version required:			v3.22.6-alpha
+# Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.24 1998/09/01 15:27:36 thepish Exp $
+# $Id$
 #
 
-DISTNAME=	mysql-3.21.33
-PKGNAME=	mysql-3.21.33
+DISTNAME=	mysql-3.22.6-alpha
+PKGNAME=	mysql-3.22.6a
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
-		http://mysql.bluep.com/Downloads/ \
-		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
-		http://www.tcx.se/Downloads/MySQL-3.21/
+MASTER_SITES=	http://mysql.polaris.ca/Downloads/MySQL-3.22/ \
+		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
+		http://www.tcx.se/Downloads/MySQL-3.22/
 
 MAINTAINER=	ibex@physik.TU-Berlin.DE
 
+NO_LATEST_LINK=	yes
 MAN1=		mysql.1
 
-USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
-		--with-MAKE=gmake \
 		--without-perl \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
+		PERL5=${PREFIX}/bin/perl5 \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
+OSVERSION!=	sysctl -n kern.osreldate
+.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
+.else
+CONFIGURE_ARGS+=	--with-mit-threads
+.endif
+
+.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
+	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
+	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "         'mysqladmin shutdown' from working properly."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
+	@${ECHO} "are still to buggy to use with mysql."
+	@${ECHO} "Using mit-pthreads."
+	@${ECHO}
+.endif
+	
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -39,24 +67,29 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	(cd ${WRKSRC};scripts/mysql_install_db)
+	${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
 	@ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh
-	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
+	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh
+
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/mysql
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
 	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
+.endif
+
+	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index a144afd0ba9d..708240ebc2fe 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -1,35 +1,63 @@
-# ports collection makefile for:	mySQL
-# Version required:			v3.21.33
-# Date created:				14 Aug 1998
+# ports collection makefile for:	MySQL
+# Version required:			v3.22.6-alpha
+# Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.24 1998/09/01 15:27:36 thepish Exp $
+# $Id$
 #
 
-DISTNAME=	mysql-3.21.33
-PKGNAME=	mysql-3.21.33
+DISTNAME=	mysql-3.22.6-alpha
+PKGNAME=	mysql-3.22.6a
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
-		http://mysql.bluep.com/Downloads/ \
-		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
-		http://www.tcx.se/Downloads/MySQL-3.21/
+MASTER_SITES=	http://mysql.polaris.ca/Downloads/MySQL-3.22/ \
+		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
+		http://www.tcx.se/Downloads/MySQL-3.22/
 
 MAINTAINER=	ibex@physik.TU-Berlin.DE
 
+NO_LATEST_LINK=	yes
 MAN1=		mysql.1
 
-USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
-		--with-MAKE=gmake \
 		--without-perl \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
+		PERL5=${PREFIX}/bin/perl5 \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
+OSVERSION!=	sysctl -n kern.osreldate
+.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
+.else
+CONFIGURE_ARGS+=	--with-mit-threads
+.endif
+
+.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
+	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
+	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "         'mysqladmin shutdown' from working properly."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
+	@${ECHO} "are still to buggy to use with mysql."
+	@${ECHO} "Using mit-pthreads."
+	@${ECHO}
+.endif
+	
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -39,24 +67,29 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	(cd ${WRKSRC};scripts/mysql_install_db)
+	${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
 	@ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh
-	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
+	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh
+
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/mysql
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
 	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
+.endif
+
+	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index be2d2172b84c..3c563e34508d 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.21.33.tar.gz) = 64672bebf05fa95f9772303d3b86e40b
+MD5 (mysql-3.22.6-alpha.tar.gz) = 2bd0e6a7beb21dcb8d6e8b5b5f2b3bc4
diff --git a/databases/mysql51-server/files/patch-ab b/databases/mysql51-server/files/patch-ab
index 6f41ac6a3549..2aa751cd44c6 100644
--- a/databases/mysql51-server/files/patch-ab
+++ b/databases/mysql51-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 <<END_OF_DATA
- # Create tables from the .frm files
-@@ -149,11 +136,7 @@
+@@ -150,9 +115,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');
+-
+ INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
+ INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
+ 
+@@ -160,16 +122,19 @@
+ INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N');
+ 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
+   echo "mysqld demon is running and mysql grant tables are installed."
    echo
    echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
-   echo
+-  echo
 -  echo "You can test the MySQL demon with the benchmarks in the 'bench'"
 -  echo "directory:"
 -  echo "cd bench ; run-all-tests"
--  echo
--  echo "You can also try the mysql command line tool with:"
-+  echo "You can test the MySQL daemon with the mysql command line tool:"
-   echo "@bindir@/mysql test"
    echo
-   echo "Plese report any problems with the @scriptdir@/mysqlbug script!"
+   echo "You can also try the mysql command line tool with:"
+   echo "@bindir@/mysql test"
diff --git a/databases/mysql51-server/files/patch-af b/databases/mysql51-server/files/patch-af
new file mode 100644
index 000000000000..77d9219c4ecb
--- /dev/null
+++ b/databases/mysql51-server/files/patch-af
@@ -0,0 +1,65 @@
+--- scripts/safe_mysqld.sh.orig	Mon Aug 10 16:31:56 1998
++++ scripts/safe_mysqld.sh	Tue Sep  1 11:03:21 1998
+@@ -10,25 +10,9 @@
+ # mysql.server works by first doing a cd to the base directory and from there
+ # executing safe_mysqld
+ 
+-# 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 \
+- -x ./bin/mysqld
+-then
+-  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data is
+-  DATADIR=$MY_BASEDIR_VERSION/data	# Where the databases are
+-  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld are
+-# 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
+-then
+-  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var is
+-  DATADIR=$MY_BASEDIR_VERSION/var	# Where the databases are
+-  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld are
+-else
+-  MY_BASEDIR_VERSION=@prefix@
+-  DATADIR=@localstatedir@
+-  ledir=@libexecdir@
+-fi
++MY_BASEDIR_VERSION=@prefix@
++DATADIR=@localstatedir@
++ledir=@libexecdir@
+ 
+ pidfile=$DATADIR/`@HOSTNAME@`.pid
+ log=$DATADIR/`@HOSTNAME@`.log
+@@ -93,33 +77,6 @@
+   if test ! -f $pidfile			# This is removed if normal shutdown
+   then
+     break;
+-  fi
+-  if @IS_LINUX@
+-  then
+-    # Test if one proces was hanging.
+-    # This is only a fix for Linux (running as base 3 mysqld processes)
+-    # but should work for the rest of the servers.
+-    # 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 $log
+-    I=1
+-    while test "$I" -le "$numofproces"
+-    do 
+-      PROC=`ps x | grep $ledir/mysqld | grep -v "grep" | tail -1` 
+-	for T in $PROC
+-	do
+-	  break
+-	done
+-	#    echo "TEST $I - $T **"
+-	if kill -9 $T
+-	then
+-	  echo "mysqld proces hanging, pid $T - killed" | tee -a $log
+-	else 
+-	  break
+-	fi
+-	I=`expr $I + 1`
+-    done
+   fi
+   echo "mysqld restarted on " `date` | tee -a $log
+ done
diff --git a/databases/mysql51-server/pkg-plist b/databases/mysql51-server/pkg-plist
index 082897879a96..4bcfb3097885 100644
--- a/databases/mysql51-server/pkg-plist
+++ b/databases/mysql51-server/pkg-plist
@@ -1,4 +1,5 @@
 bin/add_file_priv
+bin/add_func_table
 bin/add_long_password
 bin/comp_err
 bin/isamchk
@@ -16,6 +17,7 @@ bin/mysqlimport
 bin/mysqlshow
 bin/perror
 bin/replace
+bin/resolveip
 bin/safe_mysqld
 bin/which1
 bin/zap
@@ -28,6 +30,7 @@ include/mysql/my_sys.h
 include/mysql/mysql.h
 include/mysql/mysql_com.h
 include/mysql/mysql_version.h
+include/mysql/mysqld_error.h
 @unexec install-info --delete %D/info/mysql.info %D/info/dir
 info/mysql.info
 @exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
@@ -36,6 +39,9 @@ lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
 lib/mysql/libmysqlclient.a
+lib/mysql/libmysqlclient.la
+lib/mysql/libmysqlclient.so
+lib/mysql/libmysqlclient.so.4.0
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 lib/mysql/libnisam.a
@@ -56,6 +62,13 @@ share/mysql/french/errmsg.sys
 share/mysql/french/errmsg.txt
 share/mysql/german/errmsg.sys
 share/mysql/german/errmsg.txt
+share/mysql/hungarian/errmsg.sys
+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.6-alpha.spec
+share/mysql/mysql-log-rotate
 share/mysql/mysql/db.frm
 share/mysql/mysql/func.frm
 share/mysql/mysql/host.frm
@@ -82,6 +95,8 @@ share/mysql/swedish/errmsg.txt
 @dirrm share/mysql/english
 @dirrm share/mysql/french
 @dirrm share/mysql/german
+@dirrm share/mysql/hungarian
+@dirrm share/mysql/italian
 @dirrm share/mysql/mysql
 @dirrm share/mysql/norwegian
 @dirrm share/mysql/norwegian-ny
@@ -93,3 +108,5 @@ share/mysql/swedish/errmsg.txt
 @dirrm share/mysql
 @exec %D/bin/mysql_install_db
 @exec /usr/bin/killall mysqld
+@unexec /sbin/ldconfig -R
+@exec /sbin/ldconfig -m %D/lib
diff --git a/databases/mysql54-client/Makefile b/databases/mysql54-client/Makefile
index a144afd0ba9d..708240ebc2fe 100644
--- a/databases/mysql54-client/Makefile
+++ b/databases/mysql54-client/Makefile
@@ -1,35 +1,63 @@
-# ports collection makefile for:	mySQL
-# Version required:			v3.21.33
-# Date created:				14 Aug 1998
+# ports collection makefile for:	MySQL
+# Version required:			v3.22.6-alpha
+# Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.24 1998/09/01 15:27:36 thepish Exp $
+# $Id$
 #
 
-DISTNAME=	mysql-3.21.33
-PKGNAME=	mysql-3.21.33
+DISTNAME=	mysql-3.22.6-alpha
+PKGNAME=	mysql-3.22.6a
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
-		http://mysql.bluep.com/Downloads/ \
-		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
-		http://www.tcx.se/Downloads/MySQL-3.21/
+MASTER_SITES=	http://mysql.polaris.ca/Downloads/MySQL-3.22/ \
+		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
+		http://www.tcx.se/Downloads/MySQL-3.22/
 
 MAINTAINER=	ibex@physik.TU-Berlin.DE
 
+NO_LATEST_LINK=	yes
 MAN1=		mysql.1
 
-USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
-		--with-MAKE=gmake \
 		--without-perl \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
+		PERL5=${PREFIX}/bin/perl5 \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
+OSVERSION!=	sysctl -n kern.osreldate
+.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
+.else
+CONFIGURE_ARGS+=	--with-mit-threads
+.endif
+
+.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
+	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
+	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "         'mysqladmin shutdown' from working properly."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
+	@${ECHO} "are still to buggy to use with mysql."
+	@${ECHO} "Using mit-pthreads."
+	@${ECHO}
+.endif
+	
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -39,24 +67,29 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	(cd ${WRKSRC};scripts/mysql_install_db)
+	${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
 	@ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh
-	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
+	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh
+
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/mysql
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
 	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
+.endif
+
+	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index a144afd0ba9d..708240ebc2fe 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -1,35 +1,63 @@
-# ports collection makefile for:	mySQL
-# Version required:			v3.21.33
-# Date created:				14 Aug 1998
+# ports collection makefile for:	MySQL
+# Version required:			v3.22.6-alpha
+# Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.24 1998/09/01 15:27:36 thepish Exp $
+# $Id$
 #
 
-DISTNAME=	mysql-3.21.33
-PKGNAME=	mysql-3.21.33
+DISTNAME=	mysql-3.22.6-alpha
+PKGNAME=	mysql-3.22.6a
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
-		http://mysql.bluep.com/Downloads/ \
-		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
-		http://www.tcx.se/Downloads/MySQL-3.21/
+MASTER_SITES=	http://mysql.polaris.ca/Downloads/MySQL-3.22/ \
+		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
+		http://www.tcx.se/Downloads/MySQL-3.22/
 
 MAINTAINER=	ibex@physik.TU-Berlin.DE
 
+NO_LATEST_LINK=	yes
 MAN1=		mysql.1
 
-USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
-		--with-MAKE=gmake \
 		--without-perl \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
+		PERL5=${PREFIX}/bin/perl5 \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
+OSVERSION!=	sysctl -n kern.osreldate
+.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
+.else
+CONFIGURE_ARGS+=	--with-mit-threads
+.endif
+
+.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
+	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
+	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "         'mysqladmin shutdown' from working properly."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
+	@${ECHO} "are still to buggy to use with mysql."
+	@${ECHO} "Using mit-pthreads."
+	@${ECHO}
+.endif
+	
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -39,24 +67,29 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	(cd ${WRKSRC};scripts/mysql_install_db)
+	${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
 	@ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh
-	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
+	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh
+
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/mysql
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
 	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
+.endif
+
+	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo
index be2d2172b84c..3c563e34508d 100644
--- a/databases/mysql54-server/distinfo
+++ b/databases/mysql54-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.21.33.tar.gz) = 64672bebf05fa95f9772303d3b86e40b
+MD5 (mysql-3.22.6-alpha.tar.gz) = 2bd0e6a7beb21dcb8d6e8b5b5f2b3bc4
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 <<END_OF_DATA
- # Create tables from the .frm files
-@@ -149,11 +136,7 @@
+@@ -150,9 +115,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');
+-
+ INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
+ INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
+ 
+@@ -160,16 +122,19 @@
+ INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N');
+ 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
+   echo "mysqld demon is running and mysql grant tables are installed."
    echo
    echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
-   echo
+-  echo
 -  echo "You can test the MySQL demon with the benchmarks in the 'bench'"
 -  echo "directory:"
 -  echo "cd bench ; run-all-tests"
--  echo
--  echo "You can also try the mysql command line tool with:"
-+  echo "You can test the MySQL daemon with the mysql command line tool:"
-   echo "@bindir@/mysql test"
    echo
-   echo "Plese report any problems with the @scriptdir@/mysqlbug script!"
+   echo "You can also try the mysql command line tool with:"
+   echo "@bindir@/mysql test"
diff --git a/databases/mysql54-server/files/patch-af b/databases/mysql54-server/files/patch-af
new file mode 100644
index 000000000000..77d9219c4ecb
--- /dev/null
+++ b/databases/mysql54-server/files/patch-af
@@ -0,0 +1,65 @@
+--- scripts/safe_mysqld.sh.orig	Mon Aug 10 16:31:56 1998
++++ scripts/safe_mysqld.sh	Tue Sep  1 11:03:21 1998
+@@ -10,25 +10,9 @@
+ # mysql.server works by first doing a cd to the base directory and from there
+ # executing safe_mysqld
+ 
+-# 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 \
+- -x ./bin/mysqld
+-then
+-  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data is
+-  DATADIR=$MY_BASEDIR_VERSION/data	# Where the databases are
+-  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld are
+-# 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
+-then
+-  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var is
+-  DATADIR=$MY_BASEDIR_VERSION/var	# Where the databases are
+-  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld are
+-else
+-  MY_BASEDIR_VERSION=@prefix@
+-  DATADIR=@localstatedir@
+-  ledir=@libexecdir@
+-fi
++MY_BASEDIR_VERSION=@prefix@
++DATADIR=@localstatedir@
++ledir=@libexecdir@
+ 
+ pidfile=$DATADIR/`@HOSTNAME@`.pid
+ log=$DATADIR/`@HOSTNAME@`.log
+@@ -93,33 +77,6 @@
+   if test ! -f $pidfile			# This is removed if normal shutdown
+   then
+     break;
+-  fi
+-  if @IS_LINUX@
+-  then
+-    # Test if one proces was hanging.
+-    # This is only a fix for Linux (running as base 3 mysqld processes)
+-    # but should work for the rest of the servers.
+-    # 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 $log
+-    I=1
+-    while test "$I" -le "$numofproces"
+-    do 
+-      PROC=`ps x | grep $ledir/mysqld | grep -v "grep" | tail -1` 
+-	for T in $PROC
+-	do
+-	  break
+-	done
+-	#    echo "TEST $I - $T **"
+-	if kill -9 $T
+-	then
+-	  echo "mysqld proces hanging, pid $T - killed" | tee -a $log
+-	else 
+-	  break
+-	fi
+-	I=`expr $I + 1`
+-    done
+   fi
+   echo "mysqld restarted on " `date` | tee -a $log
+ done
diff --git a/databases/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist
index 082897879a96..4bcfb3097885 100644
--- a/databases/mysql54-server/pkg-plist
+++ b/databases/mysql54-server/pkg-plist
@@ -1,4 +1,5 @@
 bin/add_file_priv
+bin/add_func_table
 bin/add_long_password
 bin/comp_err
 bin/isamchk
@@ -16,6 +17,7 @@ bin/mysqlimport
 bin/mysqlshow
 bin/perror
 bin/replace
+bin/resolveip
 bin/safe_mysqld
 bin/which1
 bin/zap
@@ -28,6 +30,7 @@ include/mysql/my_sys.h
 include/mysql/mysql.h
 include/mysql/mysql_com.h
 include/mysql/mysql_version.h
+include/mysql/mysqld_error.h
 @unexec install-info --delete %D/info/mysql.info %D/info/dir
 info/mysql.info
 @exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
@@ -36,6 +39,9 @@ lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
 lib/mysql/libmysqlclient.a
+lib/mysql/libmysqlclient.la
+lib/mysql/libmysqlclient.so
+lib/mysql/libmysqlclient.so.4.0
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 lib/mysql/libnisam.a
@@ -56,6 +62,13 @@ share/mysql/french/errmsg.sys
 share/mysql/french/errmsg.txt
 share/mysql/german/errmsg.sys
 share/mysql/german/errmsg.txt
+share/mysql/hungarian/errmsg.sys
+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.6-alpha.spec
+share/mysql/mysql-log-rotate
 share/mysql/mysql/db.frm
 share/mysql/mysql/func.frm
 share/mysql/mysql/host.frm
@@ -82,6 +95,8 @@ share/mysql/swedish/errmsg.txt
 @dirrm share/mysql/english
 @dirrm share/mysql/french
 @dirrm share/mysql/german
+@dirrm share/mysql/hungarian
+@dirrm share/mysql/italian
 @dirrm share/mysql/mysql
 @dirrm share/mysql/norwegian
 @dirrm share/mysql/norwegian-ny
@@ -93,3 +108,5 @@ share/mysql/swedish/errmsg.txt
 @dirrm share/mysql
 @exec %D/bin/mysql_install_db
 @exec /usr/bin/killall mysqld
+@unexec /sbin/ldconfig -R
+@exec /sbin/ldconfig -m %D/lib
diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index a144afd0ba9d..708240ebc2fe 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -1,35 +1,63 @@
-# ports collection makefile for:	mySQL
-# Version required:			v3.21.33
-# Date created:				14 Aug 1998
+# ports collection makefile for:	MySQL
+# Version required:			v3.22.6-alpha
+# Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.24 1998/09/01 15:27:36 thepish Exp $
+# $Id$
 #
 
-DISTNAME=	mysql-3.21.33
-PKGNAME=	mysql-3.21.33
+DISTNAME=	mysql-3.22.6-alpha
+PKGNAME=	mysql-3.22.6a
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
-		http://mysql.bluep.com/Downloads/ \
-		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
-		http://www.tcx.se/Downloads/MySQL-3.21/
+MASTER_SITES=	http://mysql.polaris.ca/Downloads/MySQL-3.22/ \
+		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
+		http://www.tcx.se/Downloads/MySQL-3.22/
 
 MAINTAINER=	ibex@physik.TU-Berlin.DE
 
+NO_LATEST_LINK=	yes
 MAN1=		mysql.1
 
-USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
-		--with-MAKE=gmake \
 		--without-perl \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
+		PERL5=${PREFIX}/bin/perl5 \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
+OSVERSION!=	sysctl -n kern.osreldate
+.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
+.else
+CONFIGURE_ARGS+=	--with-mit-threads
+.endif
+
+.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
+	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
+	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "         'mysqladmin shutdown' from working properly."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
+	@${ECHO} "are still to buggy to use with mysql."
+	@${ECHO} "Using mit-pthreads."
+	@${ECHO}
+.endif
+	
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -39,24 +67,29 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	(cd ${WRKSRC};scripts/mysql_install_db)
+	${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
 	@ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh
-	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
+	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh
+
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/mysql
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
 	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
+.endif
+
+	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index a144afd0ba9d..708240ebc2fe 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -1,35 +1,63 @@
-# ports collection makefile for:	mySQL
-# Version required:			v3.21.33
-# Date created:				14 Aug 1998
+# ports collection makefile for:	MySQL
+# Version required:			v3.22.6-alpha
+# Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.24 1998/09/01 15:27:36 thepish Exp $
+# $Id$
 #
 
-DISTNAME=	mysql-3.21.33
-PKGNAME=	mysql-3.21.33
+DISTNAME=	mysql-3.22.6-alpha
+PKGNAME=	mysql-3.22.6a
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
-		http://mysql.bluep.com/Downloads/ \
-		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
-		http://www.tcx.se/Downloads/MySQL-3.21/
+MASTER_SITES=	http://mysql.polaris.ca/Downloads/MySQL-3.22/ \
+		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
+		http://www.tcx.se/Downloads/MySQL-3.22/
 
 MAINTAINER=	ibex@physik.TU-Berlin.DE
 
+NO_LATEST_LINK=	yes
 MAN1=		mysql.1
 
-USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
-		--with-MAKE=gmake \
 		--without-perl \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
+		PERL5=${PREFIX}/bin/perl5 \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
+OSVERSION!=	sysctl -n kern.osreldate
+.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
+.else
+CONFIGURE_ARGS+=	--with-mit-threads
+.endif
+
+.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
+	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
+	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "         'mysqladmin shutdown' from working properly."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
+	@${ECHO} "are still to buggy to use with mysql."
+	@${ECHO} "Using mit-pthreads."
+	@${ECHO}
+.endif
+	
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -39,24 +67,29 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	(cd ${WRKSRC};scripts/mysql_install_db)
+	${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
 	@ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh
-	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
+	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh
+
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/mysql
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
 	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
+.endif
+
+	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo
index be2d2172b84c..3c563e34508d 100644
--- a/databases/mysql55-server/distinfo
+++ b/databases/mysql55-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.21.33.tar.gz) = 64672bebf05fa95f9772303d3b86e40b
+MD5 (mysql-3.22.6-alpha.tar.gz) = 2bd0e6a7beb21dcb8d6e8b5b5f2b3bc4
diff --git a/databases/mysql55-server/files/patch-ab b/databases/mysql55-server/files/patch-ab
index 6f41ac6a3549..2aa751cd44c6 100644
--- a/databases/mysql55-server/files/patch-ab
+++ b/databases/mysql55-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 <<END_OF_DATA
- # Create tables from the .frm files
-@@ -149,11 +136,7 @@
+@@ -150,9 +115,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');
+-
+ INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
+ INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
+ 
+@@ -160,16 +122,19 @@
+ INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N');
+ 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
+   echo "mysqld demon is running and mysql grant tables are installed."
    echo
    echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
-   echo
+-  echo
 -  echo "You can test the MySQL demon with the benchmarks in the 'bench'"
 -  echo "directory:"
 -  echo "cd bench ; run-all-tests"
--  echo
--  echo "You can also try the mysql command line tool with:"
-+  echo "You can test the MySQL daemon with the mysql command line tool:"
-   echo "@bindir@/mysql test"
    echo
-   echo "Plese report any problems with the @scriptdir@/mysqlbug script!"
+   echo "You can also try the mysql command line tool with:"
+   echo "@bindir@/mysql test"
diff --git a/databases/mysql55-server/files/patch-af b/databases/mysql55-server/files/patch-af
new file mode 100644
index 000000000000..77d9219c4ecb
--- /dev/null
+++ b/databases/mysql55-server/files/patch-af
@@ -0,0 +1,65 @@
+--- scripts/safe_mysqld.sh.orig	Mon Aug 10 16:31:56 1998
++++ scripts/safe_mysqld.sh	Tue Sep  1 11:03:21 1998
+@@ -10,25 +10,9 @@
+ # mysql.server works by first doing a cd to the base directory and from there
+ # executing safe_mysqld
+ 
+-# 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 \
+- -x ./bin/mysqld
+-then
+-  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data is
+-  DATADIR=$MY_BASEDIR_VERSION/data	# Where the databases are
+-  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld are
+-# 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
+-then
+-  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var is
+-  DATADIR=$MY_BASEDIR_VERSION/var	# Where the databases are
+-  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld are
+-else
+-  MY_BASEDIR_VERSION=@prefix@
+-  DATADIR=@localstatedir@
+-  ledir=@libexecdir@
+-fi
++MY_BASEDIR_VERSION=@prefix@
++DATADIR=@localstatedir@
++ledir=@libexecdir@
+ 
+ pidfile=$DATADIR/`@HOSTNAME@`.pid
+ log=$DATADIR/`@HOSTNAME@`.log
+@@ -93,33 +77,6 @@
+   if test ! -f $pidfile			# This is removed if normal shutdown
+   then
+     break;
+-  fi
+-  if @IS_LINUX@
+-  then
+-    # Test if one proces was hanging.
+-    # This is only a fix for Linux (running as base 3 mysqld processes)
+-    # but should work for the rest of the servers.
+-    # 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 $log
+-    I=1
+-    while test "$I" -le "$numofproces"
+-    do 
+-      PROC=`ps x | grep $ledir/mysqld | grep -v "grep" | tail -1` 
+-	for T in $PROC
+-	do
+-	  break
+-	done
+-	#    echo "TEST $I - $T **"
+-	if kill -9 $T
+-	then
+-	  echo "mysqld proces hanging, pid $T - killed" | tee -a $log
+-	else 
+-	  break
+-	fi
+-	I=`expr $I + 1`
+-    done
+   fi
+   echo "mysqld restarted on " `date` | tee -a $log
+ done
diff --git a/databases/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist
index 082897879a96..4bcfb3097885 100644
--- a/databases/mysql55-server/pkg-plist
+++ b/databases/mysql55-server/pkg-plist
@@ -1,4 +1,5 @@
 bin/add_file_priv
+bin/add_func_table
 bin/add_long_password
 bin/comp_err
 bin/isamchk
@@ -16,6 +17,7 @@ bin/mysqlimport
 bin/mysqlshow
 bin/perror
 bin/replace
+bin/resolveip
 bin/safe_mysqld
 bin/which1
 bin/zap
@@ -28,6 +30,7 @@ include/mysql/my_sys.h
 include/mysql/mysql.h
 include/mysql/mysql_com.h
 include/mysql/mysql_version.h
+include/mysql/mysqld_error.h
 @unexec install-info --delete %D/info/mysql.info %D/info/dir
 info/mysql.info
 @exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
@@ -36,6 +39,9 @@ lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
 lib/mysql/libmysqlclient.a
+lib/mysql/libmysqlclient.la
+lib/mysql/libmysqlclient.so
+lib/mysql/libmysqlclient.so.4.0
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 lib/mysql/libnisam.a
@@ -56,6 +62,13 @@ share/mysql/french/errmsg.sys
 share/mysql/french/errmsg.txt
 share/mysql/german/errmsg.sys
 share/mysql/german/errmsg.txt
+share/mysql/hungarian/errmsg.sys
+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.6-alpha.spec
+share/mysql/mysql-log-rotate
 share/mysql/mysql/db.frm
 share/mysql/mysql/func.frm
 share/mysql/mysql/host.frm
@@ -82,6 +95,8 @@ share/mysql/swedish/errmsg.txt
 @dirrm share/mysql/english
 @dirrm share/mysql/french
 @dirrm share/mysql/german
+@dirrm share/mysql/hungarian
+@dirrm share/mysql/italian
 @dirrm share/mysql/mysql
 @dirrm share/mysql/norwegian
 @dirrm share/mysql/norwegian-ny
@@ -93,3 +108,5 @@ share/mysql/swedish/errmsg.txt
 @dirrm share/mysql
 @exec %D/bin/mysql_install_db
 @exec /usr/bin/killall mysqld
+@unexec /sbin/ldconfig -R
+@exec /sbin/ldconfig -m %D/lib
diff --git a/databases/mysql60-client/Makefile b/databases/mysql60-client/Makefile
index a144afd0ba9d..708240ebc2fe 100644
--- a/databases/mysql60-client/Makefile
+++ b/databases/mysql60-client/Makefile
@@ -1,35 +1,63 @@
-# ports collection makefile for:	mySQL
-# Version required:			v3.21.33
-# Date created:				14 Aug 1998
+# ports collection makefile for:	MySQL
+# Version required:			v3.22.6-alpha
+# Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.24 1998/09/01 15:27:36 thepish Exp $
+# $Id$
 #
 
-DISTNAME=	mysql-3.21.33
-PKGNAME=	mysql-3.21.33
+DISTNAME=	mysql-3.22.6-alpha
+PKGNAME=	mysql-3.22.6a
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
-		http://mysql.bluep.com/Downloads/ \
-		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
-		http://www.tcx.se/Downloads/MySQL-3.21/
+MASTER_SITES=	http://mysql.polaris.ca/Downloads/MySQL-3.22/ \
+		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
+		http://www.tcx.se/Downloads/MySQL-3.22/
 
 MAINTAINER=	ibex@physik.TU-Berlin.DE
 
+NO_LATEST_LINK=	yes
 MAN1=		mysql.1
 
-USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
-		--with-MAKE=gmake \
 		--without-perl \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
+		PERL5=${PREFIX}/bin/perl5 \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
+OSVERSION!=	sysctl -n kern.osreldate
+.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
+.else
+CONFIGURE_ARGS+=	--with-mit-threads
+.endif
+
+.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
+	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
+	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "         'mysqladmin shutdown' from working properly."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
+	@${ECHO} "are still to buggy to use with mysql."
+	@${ECHO} "Using mit-pthreads."
+	@${ECHO}
+.endif
+	
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -39,24 +67,29 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	(cd ${WRKSRC};scripts/mysql_install_db)
+	${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
 	@ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh
-	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
+	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh
+
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/mysql
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
 	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
+.endif
+
+	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index a144afd0ba9d..708240ebc2fe 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -1,35 +1,63 @@
-# ports collection makefile for:	mySQL
-# Version required:			v3.21.33
-# Date created:				14 Aug 1998
+# ports collection makefile for:	MySQL
+# Version required:			v3.22.6-alpha
+# Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.24 1998/09/01 15:27:36 thepish Exp $
+# $Id$
 #
 
-DISTNAME=	mysql-3.21.33
-PKGNAME=	mysql-3.21.33
+DISTNAME=	mysql-3.22.6-alpha
+PKGNAME=	mysql-3.22.6a
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
-		http://mysql.bluep.com/Downloads/ \
-		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
-		http://www.tcx.se/Downloads/MySQL-3.21/
+MASTER_SITES=	http://mysql.polaris.ca/Downloads/MySQL-3.22/ \
+		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
+		http://www.tcx.se/Downloads/MySQL-3.22/
 
 MAINTAINER=	ibex@physik.TU-Berlin.DE
 
+NO_LATEST_LINK=	yes
 MAN1=		mysql.1
 
-USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
-		--with-MAKE=gmake \
 		--without-perl \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
+		PERL5=${PREFIX}/bin/perl5 \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
+OSVERSION!=	sysctl -n kern.osreldate
+.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
+.else
+CONFIGURE_ARGS+=	--with-mit-threads
+.endif
+
+.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
+	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
+	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "         'mysqladmin shutdown' from working properly."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
+	@${ECHO} "are still to buggy to use with mysql."
+	@${ECHO} "Using mit-pthreads."
+	@${ECHO}
+.endif
+	
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -39,24 +67,29 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	(cd ${WRKSRC};scripts/mysql_install_db)
+	${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
 	@ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh
-	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
+	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh
+
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/mysql
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
 	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
+.endif
+
+	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo
index be2d2172b84c..3c563e34508d 100644
--- a/databases/mysql60-server/distinfo
+++ b/databases/mysql60-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.21.33.tar.gz) = 64672bebf05fa95f9772303d3b86e40b
+MD5 (mysql-3.22.6-alpha.tar.gz) = 2bd0e6a7beb21dcb8d6e8b5b5f2b3bc4
diff --git a/databases/mysql60-server/files/patch-ab b/databases/mysql60-server/files/patch-ab
index 6f41ac6a3549..2aa751cd44c6 100644
--- a/databases/mysql60-server/files/patch-ab
+++ b/databases/mysql60-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 <<END_OF_DATA
- # Create tables from the .frm files
-@@ -149,11 +136,7 @@
+@@ -150,9 +115,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');
+-
+ INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
+ INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
+ 
+@@ -160,16 +122,19 @@
+ INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N');
+ 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
+   echo "mysqld demon is running and mysql grant tables are installed."
    echo
    echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
-   echo
+-  echo
 -  echo "You can test the MySQL demon with the benchmarks in the 'bench'"
 -  echo "directory:"
 -  echo "cd bench ; run-all-tests"
--  echo
--  echo "You can also try the mysql command line tool with:"
-+  echo "You can test the MySQL daemon with the mysql command line tool:"
-   echo "@bindir@/mysql test"
    echo
-   echo "Plese report any problems with the @scriptdir@/mysqlbug script!"
+   echo "You can also try the mysql command line tool with:"
+   echo "@bindir@/mysql test"
diff --git a/databases/mysql60-server/files/patch-af b/databases/mysql60-server/files/patch-af
new file mode 100644
index 000000000000..77d9219c4ecb
--- /dev/null
+++ b/databases/mysql60-server/files/patch-af
@@ -0,0 +1,65 @@
+--- scripts/safe_mysqld.sh.orig	Mon Aug 10 16:31:56 1998
++++ scripts/safe_mysqld.sh	Tue Sep  1 11:03:21 1998
+@@ -10,25 +10,9 @@
+ # mysql.server works by first doing a cd to the base directory and from there
+ # executing safe_mysqld
+ 
+-# 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 \
+- -x ./bin/mysqld
+-then
+-  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data is
+-  DATADIR=$MY_BASEDIR_VERSION/data	# Where the databases are
+-  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld are
+-# 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
+-then
+-  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var is
+-  DATADIR=$MY_BASEDIR_VERSION/var	# Where the databases are
+-  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld are
+-else
+-  MY_BASEDIR_VERSION=@prefix@
+-  DATADIR=@localstatedir@
+-  ledir=@libexecdir@
+-fi
++MY_BASEDIR_VERSION=@prefix@
++DATADIR=@localstatedir@
++ledir=@libexecdir@
+ 
+ pidfile=$DATADIR/`@HOSTNAME@`.pid
+ log=$DATADIR/`@HOSTNAME@`.log
+@@ -93,33 +77,6 @@
+   if test ! -f $pidfile			# This is removed if normal shutdown
+   then
+     break;
+-  fi
+-  if @IS_LINUX@
+-  then
+-    # Test if one proces was hanging.
+-    # This is only a fix for Linux (running as base 3 mysqld processes)
+-    # but should work for the rest of the servers.
+-    # 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 $log
+-    I=1
+-    while test "$I" -le "$numofproces"
+-    do 
+-      PROC=`ps x | grep $ledir/mysqld | grep -v "grep" | tail -1` 
+-	for T in $PROC
+-	do
+-	  break
+-	done
+-	#    echo "TEST $I - $T **"
+-	if kill -9 $T
+-	then
+-	  echo "mysqld proces hanging, pid $T - killed" | tee -a $log
+-	else 
+-	  break
+-	fi
+-	I=`expr $I + 1`
+-    done
+   fi
+   echo "mysqld restarted on " `date` | tee -a $log
+ done
diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist
index 082897879a96..4bcfb3097885 100644
--- a/databases/mysql60-server/pkg-plist
+++ b/databases/mysql60-server/pkg-plist
@@ -1,4 +1,5 @@
 bin/add_file_priv
+bin/add_func_table
 bin/add_long_password
 bin/comp_err
 bin/isamchk
@@ -16,6 +17,7 @@ bin/mysqlimport
 bin/mysqlshow
 bin/perror
 bin/replace
+bin/resolveip
 bin/safe_mysqld
 bin/which1
 bin/zap
@@ -28,6 +30,7 @@ include/mysql/my_sys.h
 include/mysql/mysql.h
 include/mysql/mysql_com.h
 include/mysql/mysql_version.h
+include/mysql/mysqld_error.h
 @unexec install-info --delete %D/info/mysql.info %D/info/dir
 info/mysql.info
 @exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
@@ -36,6 +39,9 @@ lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
 lib/mysql/libmysqlclient.a
+lib/mysql/libmysqlclient.la
+lib/mysql/libmysqlclient.so
+lib/mysql/libmysqlclient.so.4.0
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 lib/mysql/libnisam.a
@@ -56,6 +62,13 @@ share/mysql/french/errmsg.sys
 share/mysql/french/errmsg.txt
 share/mysql/german/errmsg.sys
 share/mysql/german/errmsg.txt
+share/mysql/hungarian/errmsg.sys
+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.6-alpha.spec
+share/mysql/mysql-log-rotate
 share/mysql/mysql/db.frm
 share/mysql/mysql/func.frm
 share/mysql/mysql/host.frm
@@ -82,6 +95,8 @@ share/mysql/swedish/errmsg.txt
 @dirrm share/mysql/english
 @dirrm share/mysql/french
 @dirrm share/mysql/german
+@dirrm share/mysql/hungarian
+@dirrm share/mysql/italian
 @dirrm share/mysql/mysql
 @dirrm share/mysql/norwegian
 @dirrm share/mysql/norwegian-ny
@@ -93,3 +108,5 @@ share/mysql/swedish/errmsg.txt
 @dirrm share/mysql
 @exec %D/bin/mysql_install_db
 @exec /usr/bin/killall mysqld
+@unexec /sbin/ldconfig -R
+@exec /sbin/ldconfig -m %D/lib
diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile
index a144afd0ba9d..708240ebc2fe 100644
--- a/databases/percona55-client/Makefile
+++ b/databases/percona55-client/Makefile
@@ -1,35 +1,63 @@
-# ports collection makefile for:	mySQL
-# Version required:			v3.21.33
-# Date created:				14 Aug 1998
+# ports collection makefile for:	MySQL
+# Version required:			v3.22.6-alpha
+# Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.24 1998/09/01 15:27:36 thepish Exp $
+# $Id$
 #
 
-DISTNAME=	mysql-3.21.33
-PKGNAME=	mysql-3.21.33
+DISTNAME=	mysql-3.22.6-alpha
+PKGNAME=	mysql-3.22.6a
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
-		http://mysql.bluep.com/Downloads/ \
-		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
-		http://www.tcx.se/Downloads/MySQL-3.21/
+MASTER_SITES=	http://mysql.polaris.ca/Downloads/MySQL-3.22/ \
+		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
+		http://www.tcx.se/Downloads/MySQL-3.22/
 
 MAINTAINER=	ibex@physik.TU-Berlin.DE
 
+NO_LATEST_LINK=	yes
 MAN1=		mysql.1
 
-USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
-		--with-MAKE=gmake \
 		--without-perl \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
+		PERL5=${PREFIX}/bin/perl5 \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
+OSVERSION!=	sysctl -n kern.osreldate
+.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
+.else
+CONFIGURE_ARGS+=	--with-mit-threads
+.endif
+
+.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
+	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
+	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "         'mysqladmin shutdown' from working properly."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
+	@${ECHO} "are still to buggy to use with mysql."
+	@${ECHO} "Using mit-pthreads."
+	@${ECHO}
+.endif
+	
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -39,24 +67,29 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	(cd ${WRKSRC};scripts/mysql_install_db)
+	${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
 	@ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh
-	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
+	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh
+
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/mysql
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
 	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
+.endif
+
+	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index a144afd0ba9d..708240ebc2fe 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -1,35 +1,63 @@
-# ports collection makefile for:	mySQL
-# Version required:			v3.21.33
-# Date created:				14 Aug 1998
+# ports collection makefile for:	MySQL
+# Version required:			v3.22.6-alpha
+# Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.24 1998/09/01 15:27:36 thepish Exp $
+# $Id$
 #
 
-DISTNAME=	mysql-3.21.33
-PKGNAME=	mysql-3.21.33
+DISTNAME=	mysql-3.22.6-alpha
+PKGNAME=	mysql-3.22.6a
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
-		http://mysql.bluep.com/Downloads/ \
-		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
-		http://www.tcx.se/Downloads/MySQL-3.21/
+MASTER_SITES=	http://mysql.polaris.ca/Downloads/MySQL-3.22/ \
+		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
+		http://www.tcx.se/Downloads/MySQL-3.22/
 
 MAINTAINER=	ibex@physik.TU-Berlin.DE
 
+NO_LATEST_LINK=	yes
 MAN1=		mysql.1
 
-USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
-		--with-MAKE=gmake \
 		--without-perl \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
+		PERL5=${PREFIX}/bin/perl5 \
+		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
+OSVERSION!=	sysctl -n kern.osreldate
+.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+CONFIGURE_ARGS+=	--with-named-thread-libs=-lc_r
+.else
+CONFIGURE_ARGS+=	--with-mit-threads
+.endif
+
+.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
+	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
+	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "         'mysqladmin shutdown' from working properly."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
+	@${ECHO} "are still to buggy to use with mysql."
+	@${ECHO} "Using mit-pthreads."
+	@${ECHO}
+.endif
+	
 pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
@@ -39,24 +67,29 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	(cd ${WRKSRC};scripts/mysql_install_db)
+	${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
 	@ ${ECHO} "if [ -x ${PREFIX}/bin/safe_mysqld ]" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/mysql.sh
-	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
+	@ ${ECHO} "	${PREFIX}/bin/safe_mysqld > /dev/null & && ${ECHO} -n ' mysql'" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/mysql.sh
 	@ /bin/chmod 750 ${PREFIX}/etc/rc.d/mysql.sh
+
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/mysql
 .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
 	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
 .endfor
 	@if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
 	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
+.endif
+
+	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo
index be2d2172b84c..3c563e34508d 100644
--- a/databases/percona55-server/distinfo
+++ b/databases/percona55-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.21.33.tar.gz) = 64672bebf05fa95f9772303d3b86e40b
+MD5 (mysql-3.22.6-alpha.tar.gz) = 2bd0e6a7beb21dcb8d6e8b5b5f2b3bc4
diff --git a/databases/percona55-server/files/patch-ab b/databases/percona55-server/files/patch-ab
index 6f41ac6a3549..2aa751cd44c6 100644
--- a/databases/percona55-server/files/patch-ab
+++ b/databases/percona55-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 <<END_OF_DATA
- # Create tables from the .frm files
-@@ -149,11 +136,7 @@
+@@ -150,9 +115,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');
+-
+ INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
+ INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
+ 
+@@ -160,16 +122,19 @@
+ INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N');
+ 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
+   echo "mysqld demon is running and mysql grant tables are installed."
    echo
    echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
-   echo
+-  echo
 -  echo "You can test the MySQL demon with the benchmarks in the 'bench'"
 -  echo "directory:"
 -  echo "cd bench ; run-all-tests"
--  echo
--  echo "You can also try the mysql command line tool with:"
-+  echo "You can test the MySQL daemon with the mysql command line tool:"
-   echo "@bindir@/mysql test"
    echo
-   echo "Plese report any problems with the @scriptdir@/mysqlbug script!"
+   echo "You can also try the mysql command line tool with:"
+   echo "@bindir@/mysql test"
diff --git a/databases/percona55-server/files/patch-af b/databases/percona55-server/files/patch-af
new file mode 100644
index 000000000000..77d9219c4ecb
--- /dev/null
+++ b/databases/percona55-server/files/patch-af
@@ -0,0 +1,65 @@
+--- scripts/safe_mysqld.sh.orig	Mon Aug 10 16:31:56 1998
++++ scripts/safe_mysqld.sh	Tue Sep  1 11:03:21 1998
+@@ -10,25 +10,9 @@
+ # mysql.server works by first doing a cd to the base directory and from there
+ # executing safe_mysqld
+ 
+-# 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 \
+- -x ./bin/mysqld
+-then
+-  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data is
+-  DATADIR=$MY_BASEDIR_VERSION/data	# Where the databases are
+-  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld are
+-# 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
+-then
+-  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var is
+-  DATADIR=$MY_BASEDIR_VERSION/var	# Where the databases are
+-  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld are
+-else
+-  MY_BASEDIR_VERSION=@prefix@
+-  DATADIR=@localstatedir@
+-  ledir=@libexecdir@
+-fi
++MY_BASEDIR_VERSION=@prefix@
++DATADIR=@localstatedir@
++ledir=@libexecdir@
+ 
+ pidfile=$DATADIR/`@HOSTNAME@`.pid
+ log=$DATADIR/`@HOSTNAME@`.log
+@@ -93,33 +77,6 @@
+   if test ! -f $pidfile			# This is removed if normal shutdown
+   then
+     break;
+-  fi
+-  if @IS_LINUX@
+-  then
+-    # Test if one proces was hanging.
+-    # This is only a fix for Linux (running as base 3 mysqld processes)
+-    # but should work for the rest of the servers.
+-    # 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 $log
+-    I=1
+-    while test "$I" -le "$numofproces"
+-    do 
+-      PROC=`ps x | grep $ledir/mysqld | grep -v "grep" | tail -1` 
+-	for T in $PROC
+-	do
+-	  break
+-	done
+-	#    echo "TEST $I - $T **"
+-	if kill -9 $T
+-	then
+-	  echo "mysqld proces hanging, pid $T - killed" | tee -a $log
+-	else 
+-	  break
+-	fi
+-	I=`expr $I + 1`
+-    done
+   fi
+   echo "mysqld restarted on " `date` | tee -a $log
+ done
diff --git a/databases/percona55-server/pkg-plist b/databases/percona55-server/pkg-plist
index 082897879a96..4bcfb3097885 100644
--- a/databases/percona55-server/pkg-plist
+++ b/databases/percona55-server/pkg-plist
@@ -1,4 +1,5 @@
 bin/add_file_priv
+bin/add_func_table
 bin/add_long_password
 bin/comp_err
 bin/isamchk
@@ -16,6 +17,7 @@ bin/mysqlimport
 bin/mysqlshow
 bin/perror
 bin/replace
+bin/resolveip
 bin/safe_mysqld
 bin/which1
 bin/zap
@@ -28,6 +30,7 @@ include/mysql/my_sys.h
 include/mysql/mysql.h
 include/mysql/mysql_com.h
 include/mysql/mysql_version.h
+include/mysql/mysqld_error.h
 @unexec install-info --delete %D/info/mysql.info %D/info/dir
 info/mysql.info
 @exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
@@ -36,6 +39,9 @@ lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
 lib/mysql/libmysqlclient.a
+lib/mysql/libmysqlclient.la
+lib/mysql/libmysqlclient.so
+lib/mysql/libmysqlclient.so.4.0
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 lib/mysql/libnisam.a
@@ -56,6 +62,13 @@ share/mysql/french/errmsg.sys
 share/mysql/french/errmsg.txt
 share/mysql/german/errmsg.sys
 share/mysql/german/errmsg.txt
+share/mysql/hungarian/errmsg.sys
+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.6-alpha.spec
+share/mysql/mysql-log-rotate
 share/mysql/mysql/db.frm
 share/mysql/mysql/func.frm
 share/mysql/mysql/host.frm
@@ -82,6 +95,8 @@ share/mysql/swedish/errmsg.txt
 @dirrm share/mysql/english
 @dirrm share/mysql/french
 @dirrm share/mysql/german
+@dirrm share/mysql/hungarian
+@dirrm share/mysql/italian
 @dirrm share/mysql/mysql
 @dirrm share/mysql/norwegian
 @dirrm share/mysql/norwegian-ny
@@ -93,3 +108,5 @@ share/mysql/swedish/errmsg.txt
 @dirrm share/mysql
 @exec %D/bin/mysql_install_db
 @exec /usr/bin/killall mysqld
+@unexec /sbin/ldconfig -R
+@exec /sbin/ldconfig -m %D/lib