diff --git a/databases/mysql/Makefile b/databases/mysql/Makefile
index 79f92357704..e803b4faacf 100644
--- a/databases/mysql/Makefile
+++ b/databases/mysql/Makefile
@@ -1,17 +1,13 @@
-# $OpenBSD: Makefile,v 1.30 2000/09/24 07:04:02 brad Exp $
+# $OpenBSD: Makefile,v 1.31 2001/01/21 17:09:12 brad Exp $
 # $FreeBSD: Makefile,v 1.44 1999/03/04 21:27:58 dirk Exp $
 
-DISTNAME=	mysql-3.22.32
+DISTNAME=	mysql-3.23.31
 CATEGORIES=	databases
-NEED_VERSION=	1.330
-MASTER_SITES=	http://web.tryc.on.ca/mysql/Downloads/MySQL-3.22/ \
-		http://mysql.he.net/Downloads/MySQL-3.22/ \
-		http://www.buoy.com/mysql/Downloads/MySQL-3.22/ \
-		ftp://ftp.netcasting.net/pub/mysql/Downloads/MySQL-3.22/ \
-		http://www.mysql.net/Downloads/MySQL-3.22/ \
-		http://www.gina.net/mysql/Downloads/MySQL-3.22/ \
-		http://mysql.pingzero.net/Downloads/MySQL-3.22/ \
-		ftp://ftp.digex.net/pub/packages/database/mysql/Downloads/MySQL-3.22/ 
+NEED_VERSION=	1.336
+MASTER_SITES=	http://www.mysql.net/Downloads/MySQL-3.23/ \
+		http://www.gina.net/mysql/Downloads/MySQL-3.23/ \
+		http://mysql.pingzero.net/Downloads/MySQL-3.23/ \
+		ftp://ftp.digex.net/pub/packages/database/mysql/Downloads/MySQL-3.23/
 
 HOMEPAGE=	http://www.mysql.com/
 
@@ -29,12 +25,14 @@ CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= --enable-static \
 		 --localstatedir="${DB_DIR}" \
+		 --with-libwrap \
+		 --with-mysqld-user="mysql" \
+		 --with-unix-socket-path="${DB_DIR}/mysql.sock" \
 		 --without-perl \
 		 --without-debug \
 		 --without-readline \
 		 --without-bench \
-		 --without-mit-threads \
-		 --with-unix-socket-path="${DB_DIR}/mysql.sock"
+		 --without-mit-threads
 
 FLAVORS=	pth
 FLAVOR?=
@@ -44,11 +42,13 @@ LIB_DEPENDS=	pthread.13::devel/pth
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 .else
-. if ${MACHINE_ARCH} == "sparc"
-BROKEN=		"pthreads are currently not working on the SPARC architecture"
+. if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "powerpc"
+BROKEN=		"pthreads are currently not working on the ${MACHINE_ARCH} architecture"
 . endif
 .endif
 
+DOCS=	manual.html manual.ps manual_toc.html manual.txt
+
 pre-build:      
 	@echo ""
 	@echo "*** WARNING: you may see an error such as"
@@ -60,12 +60,12 @@ pre-build:
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mysql
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mysql/Img
-	@rm -f ${WRKDIR}/startup.sh
-	@sed -e "s|@PREFIX@|${TRUEPREFIX}|" ${FILESDIR}/startup.sh > ${WRKDIR}/startup.sh
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mysql/Flags
+	@sed -e s#@PREFIX@#${TRUEPREFIX}#g \
+		${FILESDIR}/startup.sh > ${WRKDIR}/startup.sh
 	${INSTALL_SCRIPT} ${WRKDIR}/startup.sh ${PREFIX}/lib/mysql
-	cd ${WRKSRC}/Docs; ${INSTALL_DATA} manual.html manual.ps \
-	manual_toc.html manual.txt ${PREFIX}/share/doc/mysql
-	${INSTALL_DATA} ${WRKSRC}/Docs/Img/*.gif ${PREFIX}/share/doc/mysql/Img
+	cd ${WRKSRC}/Docs; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/mysql
+	${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif \
+		${PREFIX}/share/doc/mysql/Flags
 
 .include <bsd.port.mk>
diff --git a/databases/mysql/files/md5 b/databases/mysql/files/md5
index 94fcbb78b9c..23182f6b8a4 100644
--- a/databases/mysql/files/md5
+++ b/databases/mysql/files/md5
@@ -1,3 +1,3 @@
-MD5 (mysql-3.22.32.tar.gz) = 244e08d9a1f4b2ad799aa40ad3cc897a
-RMD160 (mysql-3.22.32.tar.gz) = f89cef4bea95e6e997dc12c63d26adf3a5f75193
-SHA1 (mysql-3.22.32.tar.gz) = a9aba1f35153ae72eb06cad33f81faeb24559500
+MD5 (mysql-3.23.31.tar.gz) = b857ae8bdeefac5dd012611359efd6ee
+RMD160 (mysql-3.23.31.tar.gz) = 7472ae9a9abfd1c7a6eac6bf51c2a5e42de3bedd
+SHA1 (mysql-3.23.31.tar.gz) = e9ae69910e0c8b20db1eb5cc18b989e082c58d50
diff --git a/databases/mysql/patches/patch-aa b/databases/mysql/patches/patch-aa
deleted file mode 100644
index 131e2fae481..00000000000
--- a/databases/mysql/patches/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
---- scripts/Makefile.in.orig	Sun Dec 19 01:10:30 1999
-+++ scripts/Makefile.in	Sun Dec 19 01:10:55 1999
-@@ -316,6 +316,7 @@
- 	  -e 's!@''datadir''@!$(datadir)!g' \
- 	  -e 's!@''localstatedir''@!$(localstatedir)!g' \
- 	  -e 's!@''libexecdir''@!$(libexecdir)!g' \
-+	  -e 's!@''pkgdatadir''@!$(pkgdatadir)!g' \
- 	  -e 's!@''CC''@!@CC@!'\
- 	  -e 's!@''CXX''@!@CXX@!'\
- 	  -e 's!@''GXX''@!@GXX@!'\
diff --git a/databases/mysql/patches/patch-ab b/databases/mysql/patches/patch-ab
deleted file mode 100644
index ecc580989e2..00000000000
--- a/databases/mysql/patches/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- sql/Makefile.in.orig	Sat Jan  1 12:01:13 2000
-+++ sql/Makefile.in	Sun Jan  2 23:35:08 2000
-@@ -1134,7 +1134,7 @@
- #	$(CXXCOMPILE) $(LM_CFLAGS) $< $(mysqld_LDADD)
- 
- sql_yacc.o:	sql_yacc.cc sql_yacc.h
--		$(CXXCOMPILE) $(LM_CFLAGS) -c $<
-+		$(CXXCOMPILE) $(LM_CFLAGS) -O0 -c $<
- 
- lex_hash.h:	lex.h
- 		$(MAKE) gen_lex_hash
diff --git a/databases/mysql/patches/patch-ac b/databases/mysql/patches/patch-ac
deleted file mode 100644
index 486c608b382..00000000000
--- a/databases/mysql/patches/patch-ac
+++ /dev/null
@@ -1,57 +0,0 @@
---- scripts/mysql_install_db.sh.orig	Wed Jan 12 15:06:30 2000
-+++ scripts/mysql_install_db.sh	Thu Nov  2 09:11:00 2000
-@@ -15,10 +15,6 @@
- force=0
- IN_RPM=0
- 
--# Are we doing an rpm install?
--if test "$1" = "-IN-RPM"; then IN_RPM=1; shift; fi
--if test "$1" = "--force"; then force=1; shift; fi
--
- # Get mysqld/safe_mysqld options from /etc/my.cnf or ~/.my.cnf
- if test -w /
- then
-@@ -49,20 +45,12 @@
- 
- if test ! -x $execdir/mysqld
- then
--  if test "$IN_RPM" -eq 1
--  then
--    echo "FATAL ERROR $execdir/mysqld not found!"
--    exit 1
--  else
-     echo "Didn't find $execdir/mysqld"
-     echo "You should do a 'make install' before executing this script"
-     exit 1
--  fi
- fi
- 
--# On IRIX hostname is in /usr/bsd so add this to the path
--PATH=$PATH:/usr/bsd
--hostname=`hostname`		# Install this too in the user table
-+hostname=`hostname -s`		# Install this too in the user table
- 
- # Check if hostname is valid
- if test "$IN_RPM" -eq 0 -a $force -eq 0
-@@ -89,7 +77,7 @@
- # Create database directories mysql & test
- if test "$IN_RPM" -eq 0
- then
--  if test ! -d $ldata; then mkdir $ldata; chmod 700 $ldata ; fi
-+  if test ! -d $ldata; then mkdir $ldata; chmod 711 $ldata ; fi
-   if test ! -d $ldata/mysql; then mkdir $ldata/mysql;  chmod 700 $ldata/mysql ; fi
-   if test ! -d $ldata/test; then mkdir $ldata/test;  chmod 700 $ldata/test ; fi
-   if test -w / -a ! -z "$user"; then
-@@ -255,12 +243,6 @@
- END_OF_DATA
- then
-   echo ""
--  if test "$IN_RPM" -eq 0
--  then
--    echo "To start mysqld at boot time you have to copy support-files/mysql.server"
--    echo "to the right place for your system"
--    echo
--  fi
-   echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
-   echo "This is done with:"
-   echo "$bindir/mysqladmin -u root password 'new-password'"
diff --git a/databases/mysql/patches/patch-af b/databases/mysql/patches/patch-af
deleted file mode 100644
index 8d9370fb4ae..00000000000
--- a/databases/mysql/patches/patch-af
+++ /dev/null
@@ -1,98 +0,0 @@
---- scripts/safe_mysqld.sh.orig	Mon Jan 10 16:49:29 2000
-+++ scripts/safe_mysqld.sh	Mon Aug 14 05:01:01 2000
-@@ -12,33 +12,9 @@
- 
- trap '' 1 2 3 15			# we shouldn't let anyone kill us
- 
--# Check if we are starting this relative (for the binary release)
--if test -d ./data/mysql -a -f ./share/mysql/english/errmsg.sys -a \
-- -x ./bin/mysqld
--then
--  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data are
--  DATADIR=$MY_BASEDIR_VERSION/data	# Where the databases are
--  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
--# 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 are
--  DATADIR=$MY_BASEDIR_VERSION/var	# Where the databases are
--  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld is
--else
--  MY_BASEDIR_VERSION=@prefix@
--  DATADIR=@localstatedir@
--  ledir=@libexecdir@
--  if test ! -x $ledir/mysqld
--  then
--    echo "The file $ledir/mysqld doesn't exist or is not executable"
--    echo "Please do a cd to the mysql installation directory and restart"
--    echo "this script from there as follows:"
--    echo "./bin/safe_mysqld".
--    exit 1;
--  fi
--fi
-+MY_BASEDIR_VERSION=@prefix@
-+DATADIR=@localstatedir@
-+ledir=@libexecdir@
- 
- pid_file=$DATADIR/`@HOSTNAME@`.pid
- log=$DATADIR/`@HOSTNAME@`.log
-@@ -104,10 +80,10 @@
- #export MYSQL_TCP_PORT
- 
- # Does this work on all systems?
--#if type ulimit | grep "shell builtin" > /dev/null
--#then
--#  ulimit -n 256 > /dev/null 2>&1		# Fix for BSD and FreeBSD systems
--#fi
-+if type ulimit | grep "shell builtin" > /dev/null
-+then
-+  ulimit -n 256 > /dev/null 2>&1		# Fix for BSD and FreeBSD systems
-+fi
- 
- echo "mysqld started on " `date` >> $err_log
- while true
-@@ -116,41 +92,14 @@
-   if test "$#" -eq 0
-   then
-     nohup $ledir/mysqld --basedir=$MY_BASEDIR_VERSION --datadir=$DATADIR \
--     @MYSQLD_DEFAULT_SWITCHES@ >> $err_log 2>&1
-+     @MYSQLD_DEFAULT_SWITCHES@ --user=mysql >> $err_log 2>&1
-   else
-     nohup $ledir/mysqld --basedir=$MY_BASEDIR_VERSION --datadir=$DATADIR \
--     @MYSQLD_DEFAULT_SWITCHES@ "$@" >> $err_log 2>&1
-+     @MYSQLD_DEFAULT_SWITCHES@ --user=mysql "$@" >> $err_log 2>&1
-   fi
-   if test ! -f $pid_file		# This is removed if normal shutdown
-   then
-     break;
--  fi
--  if @IS_LINUX@
--  then
--    # Test if one process 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 process won't react on the kill.
--    numofproces=`ps x | grep -v "grep" | grep -c $ledir/mysqld`
--    echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_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 process hanging, pid $T - killed" | tee -a $err_log
--	else 
--	  break
--	fi
--	I=`expr $I + 1`
--    done
-   fi
-   echo "mysqld restarted on " `date` | tee -a $err_log
- done
diff --git a/databases/mysql/patches/patch-ag b/databases/mysql/patches/patch-configure
similarity index 63%
rename from databases/mysql/patches/patch-ag
rename to databases/mysql/patches/patch-configure
index 988bcb757e2..c3c622e0d86 100644
--- a/databases/mysql/patches/patch-ag
+++ b/databases/mysql/patches/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sat Feb 12 21:46:09 2000
-+++ configure	Sun Feb 13 22:09:51 2000
-@@ -2743,7 +2743,7 @@
+--- configure.orig	Wed Jan 17 04:40:02 2001
++++ configure	Sat Jan 20 23:03:57 2001
+@@ -2964,7 +2964,7 @@
    ;;
  esac
  fi
@@ -9,9 +9,9 @@
  if test -n "$HOSTNAME"; then
    echo "$ac_t""$HOSTNAME" 1>&6
  else
-@@ -2871,29 +2871,7 @@
+@@ -3098,35 +3098,7 @@
  echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
- echo "configure:2873: checking "how to check if pid exists"" >&5
+ echo "configure:3100: checking "how to check if pid exists"" >&5
  PS=$ac_cv_path_PS
 -# Linux style
 -if $PS p $$ 2> /dev/null | grep $0 > /dev/null
@@ -34,13 +34,35 @@
 -then
 -  FIND_PROC="$PS \$\$PID | grep mysqld > /dev/null"
 -else
--  { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; }
+-  case $SYSTEM_TYPE in
+-    *darwin*)
+-      FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
+-      ;;
+-    *)
+-      { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; }
+-  esac
 -fi
 +FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
  
  echo "$ac_t"""$FIND_PROC"" 1>&6
  
-@@ -4646,8 +4624,6 @@
+@@ -4936,6 +4908,7 @@
+   cat > conftest.$ac_ext <<EOF
+ #line 4938 "configure"
+ #include "confdefs.h"
++#include <stdio.h>
+ #include <tcpd.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+@@ -4961,6 +4934,7 @@
+       cat > conftest.$ac_ext <<EOF
+ #line 4963 "configure"
+ #include "confdefs.h"
++#include <stdio.h>
+ #include <tcpd.h>
+ int allow_severity = 0;
+ int deny_severity  = 0;
+@@ -5823,8 +5797,6 @@
  #define $ac_tr_lib 1
  EOF
  
@@ -49,17 +71,18 @@
  else
    echo "$ac_t""no" 1>&6
  fi
-@@ -4881,28 +4857,6 @@
+@@ -6046,29 +6018,6 @@
+ 
  fi
  
- 
+-
 -# Build optimized or debug version ?
 -# First check for gcc and g++
 -if test "$ac_cv_prog_gcc" = "yes"
 -then
 -  DEBUG_CFLAGS="-g"
 -  DEBUG_OPTIMIZE_CC="-O"
--  OPTIMIZE_CFLAGS="-O6"
+-  OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE"
 -else
 -  DEBUG_CFLAGS="-g"
 -  DEBUG_OPTIMIZE_CC=""
diff --git a/databases/mysql/patches/patch-ae b/databases/mysql/patches/patch-ltconfig
similarity index 80%
rename from databases/mysql/patches/patch-ae
rename to databases/mysql/patches/patch-ltconfig
index 5a7bd45608c..bd3d69cf3f4 100644
--- a/databases/mysql/patches/patch-ae
+++ b/databases/mysql/patches/patch-ltconfig
@@ -1,5 +1,5 @@
---- ltconfig.orig	Tue Dec 21 16:10:09 1999
-+++ ltconfig	Wed Dec 13 09:24:57 2000
+--- ltconfig.orig	Wed Jan 17 04:39:50 2001
++++ ltconfig	Fri Jan 19 12:07:13 2001
 @@ -1105,6 +1105,9 @@
      with_gnu_ld=no
    fi
@@ -10,7 +10,7 @@
  
  esac
  
-@@ -1391,10 +1394,18 @@
+@@ -1402,10 +1405,21 @@
      ;;
  
    openbsd*)
@@ -26,12 +26,15 @@
 +      *)
 +	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
 +	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
++	  export_dynamic_flag_spec='${wl}-E'
++	fi
 +      ;;
 +    esac
      ;;
  
    os2*)
-@@ -1961,13 +1972,10 @@
+@@ -2022,13 +2036,10 @@
  
  openbsd*)
    version_type=sunos
diff --git a/databases/mysql/patches/patch-ad b/databases/mysql/patches/patch-ltmain.sh
similarity index 87%
rename from databases/mysql/patches/patch-ad
rename to databases/mysql/patches/patch-ltmain.sh
index e92f80e846f..55325e55dc0 100644
--- a/databases/mysql/patches/patch-ad
+++ b/databases/mysql/patches/patch-ltmain.sh
@@ -1,8 +1,8 @@
---- ltmain.sh.orig	Thu Dec 30 19:42:50 1999
-+++ ltmain.sh	Wed Dec 13 09:25:00 2000
-@@ -1789,6 +1789,9 @@
- 	*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
- 	  # these systems don't actually have a c library (as such)!
+--- ltmain.sh.orig	Wed Jan 17 04:39:53 2001
++++ ltmain.sh	Fri Jan 19 12:01:17 2001
+@@ -1799,6 +1799,9 @@
+ 	  # rhapsody is a little odd...
+ 	  deplibs="$deplibs -framework System"
  	  ;;
 +	*-*-openbsd*)
 +	  # do not include libc due to us having libc/libc_r.
@@ -10,7 +10,7 @@
  	*)
  	  # Add libc to deplibs on all other systems.
  	  deplibs="$deplibs -lc"
-@@ -3522,40 +3525,6 @@
+@@ -3567,40 +3570,6 @@
      # Exit here if they wanted silent mode.
      test "$show" = : && exit 0
  
diff --git a/databases/mysql/patches/patch-scripts_Makefile.in b/databases/mysql/patches/patch-scripts_Makefile.in
new file mode 100644
index 00000000000..d6aedc52893
--- /dev/null
+++ b/databases/mysql/patches/patch-scripts_Makefile.in
@@ -0,0 +1,10 @@
+--- scripts/Makefile.in.orig	Wed Jan 17 04:46:35 2001
++++ scripts/Makefile.in	Fri Jan 19 11:00:11 2001
+@@ -345,6 +345,7 @@
+ 	  -e 's!@''datadir''@!$(datadir)!g' \
+ 	  -e 's!@''localstatedir''@!$(localstatedir)!g' \
+ 	  -e 's!@''libexecdir''@!$(libexecdir)!g' \
++	  -e 's!@''pkgdatadir''@!$(pkgdatadir)!g' \
+ 	  -e 's!@''pkglibdir''@!$(pkglibdir)!g' \
+ 	  -e 's!@''pkgincludedir''@!$(pkgincludedir)!g' \
+ 	  -e 's!@''CC''@!@CC@!'\
diff --git a/databases/mysql/patches/patch-scripts_mysql_install_db.sh b/databases/mysql/patches/patch-scripts_mysql_install_db.sh
new file mode 100644
index 00000000000..bcc1abb9106
--- /dev/null
+++ b/databases/mysql/patches/patch-scripts_mysql_install_db.sh
@@ -0,0 +1,132 @@
+--- scripts/mysql_install_db.sh.orig	Wed Jan 17 04:39:53 2001
++++ scripts/mysql_install_db.sh	Fri Jan 19 20:47:08 2001
+@@ -7,12 +7,6 @@
+ #
+ # All unrecognized arguments to this script are passed to mysqld.
+ 
+-IN_RPM=0
+-case "$1" in
+-    -IN-RPM)
+-      IN_RPM="1"; shift
+-      ;;
+-esac
+ defaults=
+ case "$1" in
+     --no-defaults|--defaults-file=*|--defaults-extra-file=*)
+@@ -33,7 +27,6 @@
+ 
+   for arg do
+     case "$arg" in
+-      --force) force=1 ;;
+       --basedir=*) basedir=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
+       --ldata=*|--datadir=*) ldata=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
+       --user=*) user=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
+@@ -69,7 +62,6 @@
+ execdir=
+ bindir=
+ basedir=
+-force=0
+ parse_arguments `$print_defaults $defaults mysqld mysql_install_db`
+ parse_arguments PICK-ARGS-FROM-ARGV "$@"
+ 
+@@ -88,52 +80,38 @@
+ 
+ if test ! -x $execdir/mysqld
+ then
+-  if test "$IN_RPM" -eq 1
+-  then
+-    echo "FATAL ERROR $execdir/mysqld not found!"
+-    exit 1
+-  else
+     echo "Didn't find $execdir/mysqld"
+     echo "You should do a 'make install' before executing this script"
+     exit 1
+-  fi
+ fi
+ 
+-hostname=`@HOSTNAME@`		# Install this too in the user table
++hostname=`hostname -s`		# Install this too in the user table
+ 
+ # Check if hostname is valid
+-if test "$IN_RPM" -eq 0 -a $force -eq 0
++resolved=`$bindir/resolveip $hostname 2>&1`
++if [ $? -ne 0 ]
+ then
+-  resolved=`$bindir/resolveip $hostname 2>&1`
+-  if [ $? -ne 0 ]
++  resolved=`$bindir/resolveip localhost 2>&1`
++  if [ $? -eq 0 ]
+   then
+-    resolved=`$bindir/resolveip localhost 2>&1`
+-    if [ $? -eq 0 ]
+-    then
+-      echo "Sorry, the host '$hostname' could not be looked up."
+-      echo "Please configure the 'hostname' command to return a correct hostname."
+-      echo "If you want to solve this at a later stage, restart this script with"
+-      echo "the --force option"
+-      exit 1
+-    fi
+-    echo "WARNING: The host '$hostname' could not be looked up with resolveip."
+-    echo "This probably means that your libc libraries are not 100 % compatible"
+-    echo "with this binary MySQL version. The MySQL deamon, mysqld, should work"
+-    echo "normally with the exception that host name resolving will not work."
+-    echo "This means that you should use IP addresses instead of hostnames"
+-    echo "when specifying MySQL privileges !"
++    echo "Sorry, the host '$hostname' could not be looked up."
++    echo "Please configure the 'hostname' command to return a correct hostname."
++    exit 1
+   fi
++  echo "WARNING: The host '$hostname' could not be looked up with resolveip."
++  echo "This probably means that your libc libraries are not 100 % compatible"
++  echo "with this binary MySQL version. The MySQL deamon, mysqld, should work"
++  echo "normally with the exception that host name resolving will not work."
++  echo "This means that you should use IP addresses instead of hostnames"
++  echo "when specifying MySQL privileges !"
+ fi
+ 
+ # Create database directories mysql & test
+-if test "$IN_RPM" -eq 0
+-then
+-  if test ! -d $ldata; then mkdir $ldata; chmod 700 $ldata ; fi
+-  if test ! -d $ldata/mysql; then mkdir $ldata/mysql;  chmod 700 $ldata/mysql ; fi
+-  if test ! -d $ldata/test; then mkdir $ldata/test;  chmod 700 $ldata/test ; fi
+-  if test -w / -a ! -z "$user"; then
+-    chown $user $ldata $ldata/mysql $ldata/test;
+-  fi
++if test ! -d $ldata; then mkdir $ldata; chmod 711 $ldata ; fi
++if test ! -d $ldata/mysql; then mkdir $ldata/mysql;  chmod 700 $ldata/mysql ; fi
++if test ! -d $ldata/test; then mkdir $ldata/test;  chmod 700 $ldata/test ; fi
++if test -w / -a ! -z "$user"; then
++  chown $user $ldata $ldata/mysql $ldata/test;
+ fi
+ 
+ # Initialize variables
+@@ -301,12 +279,6 @@
+ END_OF_DATA
+ then
+   echo ""
+-  if test "$IN_RPM" -eq 0
+-  then
+-    echo "To start mysqld at boot time you have to copy support-files/mysql.server"
+-    echo "to the right place for your system"
+-    echo
+-  fi
+   echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
+   echo "This is done with:"
+   echo "$bindir/mysqladmin -u root -p password 'new-password'"
+@@ -322,15 +294,6 @@
+     echo "able to use the new GRANT command!"
+   fi
+   echo
+-  if test -z "$IN_RPM"
+-  then
+-    echo "You can start the MySQL demon with:"
+-    echo "cd @prefix@ ; $bindir/safe_mysqld &"
+-    echo
+-    echo "You can test the MySQL demon with the benchmarks in the 'sql-bench' directory:"
+-    echo "cd sql-bench ; run-all-tests"
+-    echo
+-  fi
+   echo "Please report any problems with the @scriptdir@/mysqlbug script!"
+   echo
+   echo "The latest information about MySQL is available on the web at"
diff --git a/databases/mysql/patches/patch-scripts_safe_mysqld.sh b/databases/mysql/patches/patch-scripts_safe_mysqld.sh
new file mode 100644
index 00000000000..12b119fea5b
--- /dev/null
+++ b/databases/mysql/patches/patch-scripts_safe_mysqld.sh
@@ -0,0 +1,82 @@
+--- scripts/safe_mysqld.sh.orig	Fri Jan 19 12:24:19 2001
++++ scripts/safe_mysqld.sh	Fri Jan 19 12:36:23 2001
+@@ -64,26 +64,9 @@
+   done
+ }
+ 
+-MY_PWD=`pwd`
+-# Check if we are starting this relative (for the binary release)
+-if test -d $MY_PWD/data/mysql -a -f ./share/mysql/english/errmsg.sys -a \
+- -x ./bin/mysqld
+-then
+-  MY_BASEDIR_VERSION=$MY_PWD		# Where bin, share and data are
+-  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
+-  DATADIR=$MY_BASEDIR_VERSION/data
+-# 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=$MY_PWD		# Where libexec, share and var are
+-  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld is
+-  DATADIR=$MY_BASEDIR_VERSION/var
+-else
+-  MY_BASEDIR_VERSION=@prefix@
+-  DATADIR=@localstatedir@
+-  ledir=@libexecdir@
+-fi
++MY_BASEDIR_VERSION=@prefix@
++ledir=@libexecdir@
++DATADIR=@localstatedir@
+ 
+ MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
+ MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
+@@ -202,10 +185,10 @@
+ echo "Starting $MYSQLD daemon with databases from $DATADIR"
+ 
+ # Does this work on all systems?
+-#if type ulimit | grep "shell builtin" > /dev/null
+-#then
+-#  ulimit -n 256 > /dev/null 2>&1		# Fix for BSD and FreeBSD systems
+-#fi
++if type ulimit | grep "shell builtin" > /dev/null
++then
++  ulimit -n 256 > /dev/null 2>&1		# Fix for BSD and FreeBSD systems
++fi
+ 
+ echo "`date +'%y%m%d %H:%M:%S  mysqld started'`" >> $err_log
+ while true
+@@ -220,34 +203,6 @@
+   if test ! -f $pid_file		# This is removed if normal shutdown
+   then
+     break
+-  fi
+-
+-  if @IS_LINUX@
+-  then
+-    # Test if one process 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 process won't react on the kill.
+-    numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD`
+-    echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log
+-    I=1
+-    while test "$I" -le "$numofproces"
+-    do 
+-      PROC=`ps xa | 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 process hanging, pid $T - killed" | tee -a $err_log
+-	else 
+-	  break
+-	fi
+-	I=`expr $I + 1`
+-    done
+   fi
+ 
+   echo "`date +'%y%m%d %H:%M:%S  mysqld restarted'`" | tee -a $err_log
diff --git a/databases/mysql/patches/patch-sql_Makefile.in b/databases/mysql/patches/patch-sql_Makefile.in
new file mode 100644
index 00000000000..d8fc7bbf40c
--- /dev/null
+++ b/databases/mysql/patches/patch-sql_Makefile.in
@@ -0,0 +1,12 @@
+--- sql/Makefile.in.orig	Wed Jan 17 04:46:33 2001
++++ sql/Makefile.in	Fri Jan 19 11:02:49 2001
+@@ -1769,8 +1769,7 @@
+ 
+ sql_yacc.o:	sql_yacc.cc sql_yacc.h
+ 		@echo "Note: The following compile may take a long time."
+-		@echo "If it fails, re-run configure with --with-low-memory"
+-		$(CXXCOMPILE) $(LM_CFLAGS) -c $<
++		$(CXXCOMPILE) $(LM_CFLAGS) -O0 -c $<
+ 
+ lex_hash.h:	lex.h gen_lex_hash.cc sql_yacc.h
+ 		$(MAKE) gen_lex_hash
diff --git a/databases/mysql/pkg/PFRAG.shared b/databases/mysql/pkg/PFRAG.shared
index 3e895db9358..9defed85498 100644
--- a/databases/mysql/pkg/PFRAG.shared
+++ b/databases/mysql/pkg/PFRAG.shared
@@ -1,3 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2000/08/22 23:16:04 brad Exp $
-lib/mysql/libmysqlclient.so.6.0
+@comment $OpenBSD: PFRAG.shared,v 1.4 2001/01/21 17:09:14 brad Exp $
+lib/mysql/libmysqlclient.so.10.0
 NEWDYNLIBDIR(%B)
diff --git a/databases/mysql/pkg/PLIST b/databases/mysql/pkg/PLIST
index 45e4001856b..8521e358656 100644
--- a/databases/mysql/pkg/PLIST
+++ b/databases/mysql/pkg/PLIST
@@ -1,9 +1,15 @@
-@comment $OpenBSD: PLIST,v 1.11 2000/06/25 04:53:10 brad Exp $
+@comment $OpenBSD: PLIST,v 1.12 2001/01/21 17:09:14 brad Exp $
 bin/comp_err
 bin/isamchk
 bin/isamlog
 bin/msql2mysql
+bin/my_print_defaults
+bin/myisamchk
+bin/myisamlog
+bin/myisampack
 bin/mysql
+bin/mysql_config
+bin/mysql_convert_table_format
 bin/mysql_find_rows
 bin/mysql_fix_privilege_tables
 bin/mysql_install_db
@@ -11,22 +17,29 @@ bin/mysql_setpermission
 bin/mysql_zap
 bin/mysqlaccess
 bin/mysqladmin
+bin/mysqlbinlog
 bin/mysqlbug
+bin/mysqld_multi
 bin/mysqldump
+bin/mysqldumpslow
+bin/mysqlhotcopy
 bin/mysqlimport
 bin/mysqlshow
+bin/mysqltest
+bin/pack_isam
 bin/perror
 bin/replace
+bin/resolve_stack_dump
 bin/resolveip
 bin/safe_mysqld
 include/mysql/dbug.h
 include/mysql/errmsg.h
 include/mysql/m_ctype.h
 include/mysql/m_string.h
-include/mysql/my_config.h
 include/mysql/my_global.h
 include/mysql/my_list.h
 include/mysql/my_net.h
+include/mysql/my_no_pthread.h
 include/mysql/my_pthread.h
 include/mysql/my_sys.h
 include/mysql/mysql.h
@@ -38,12 +51,14 @@ include/mysql/sslopt-case.h
 include/mysql/sslopt-longopts.h
 include/mysql/sslopt-usage.h
 include/mysql/sslopt-vars.h
-@unexec install-info --delete %D/info/mysql.info %D/info/dir
+@unexec install-info --delete --info-dir=%D/info %D/info/mysql.info
 info/mysql.info
-@exec install-info %D/info/mysql.info %D/info/dir
+@exec install-info --info-dir=%D/info %D/info/mysql.info
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
+lib/mysql/libmyisam.a
+lib/mysql/libmyisammrg.a
 lib/mysql/libmysqlclient.a
 lib/mysql/libmysqlclient.la
 %%SHARED%%
@@ -52,54 +67,88 @@ lib/mysql/libmysys.a
 lib/mysql/libnisam.a
 lib/mysql/startup.sh
 libexec/mysqld
-share/doc/mysql/Img/australia.gif
-share/doc/mysql/Img/austria.gif
-share/doc/mysql/Img/brazil.gif
-share/doc/mysql/Img/bulgaria.gif
-share/doc/mysql/Img/canada.gif
-share/doc/mysql/Img/chile.gif
-share/doc/mysql/Img/china.gif
-share/doc/mysql/Img/croatia.gif
-share/doc/mysql/Img/czech-republic.gif
-share/doc/mysql/Img/denmark.gif
-share/doc/mysql/Img/estonia.gif
-share/doc/mysql/Img/finland.gif
-share/doc/mysql/Img/france.gif
-share/doc/mysql/Img/germany.gif
-share/doc/mysql/Img/great-britain.gif
-share/doc/mysql/Img/greece.gif
-share/doc/mysql/Img/html-fs.gif
-share/doc/mysql/Img/hungary.gif
-share/doc/mysql/Img/iceland.gif
-share/doc/mysql/Img/ireland.gif
-share/doc/mysql/Img/island.gif
-share/doc/mysql/Img/israel.gif
-share/doc/mysql/Img/italy.gif
-share/doc/mysql/Img/japan.gif
-share/doc/mysql/Img/kroatia.gif
-share/doc/mysql/Img/mysql-logo.gif
-share/doc/mysql/Img/mysql5.gif
-share/doc/mysql/Img/netherlands.gif
-share/doc/mysql/Img/poland.gif
-share/doc/mysql/Img/portugal.gif
-share/doc/mysql/Img/romania.gif
-share/doc/mysql/Img/russia.gif
-share/doc/mysql/Img/singapore.gif
-share/doc/mysql/Img/south-africa.gif
-share/doc/mysql/Img/south-africa1.gif
-share/doc/mysql/Img/south-korea.gif
-share/doc/mysql/Img/spain.gif
-share/doc/mysql/Img/sweden.gif
-share/doc/mysql/Img/switzerland.gif
-share/doc/mysql/Img/taiwan.gif
-share/doc/mysql/Img/tcxlogo3.gif
-share/doc/mysql/Img/ukraine.gif
-share/doc/mysql/Img/usa.gif
+man/man1/isamchk.1
+man/man1/isamlog.1
+man/man1/mysql.1
+man/man1/mysql_zap.1
+man/man1/mysqlaccess.1
+man/man1/mysqladmin.1
+man/man1/mysqld.1
+man/man1/mysqld_multi.1
+man/man1/mysqldump.1
+man/man1/mysqlshow.1
+man/man1/perror.1
+man/man1/replace.1
+man/man1/safe_mysqld.1
+share/doc/mysql/Flags/argentina.gif
+share/doc/mysql/Flags/australia.gif
+share/doc/mysql/Flags/austria.gif
+share/doc/mysql/Flags/brazil.gif
+share/doc/mysql/Flags/bulgaria.gif
+share/doc/mysql/Flags/canada.gif
+share/doc/mysql/Flags/chile.gif
+share/doc/mysql/Flags/china.gif
+share/doc/mysql/Flags/croatia.gif
+share/doc/mysql/Flags/czech-republic.gif
+share/doc/mysql/Flags/denmark.gif
+share/doc/mysql/Flags/estonia.gif
+share/doc/mysql/Flags/finland.gif
+share/doc/mysql/Flags/france.gif
+share/doc/mysql/Flags/germany.gif
+share/doc/mysql/Flags/great-britain.gif
+share/doc/mysql/Flags/greece.gif
+share/doc/mysql/Flags/hungary.gif
+share/doc/mysql/Flags/iceland.gif
+share/doc/mysql/Flags/ireland.gif
+share/doc/mysql/Flags/island.gif
+share/doc/mysql/Flags/israel.gif
+share/doc/mysql/Flags/italy.gif
+share/doc/mysql/Flags/japan.gif
+share/doc/mysql/Flags/kroatia.gif
+share/doc/mysql/Flags/netherlands.gif
+share/doc/mysql/Flags/poland.gif
+share/doc/mysql/Flags/portugal.gif
+share/doc/mysql/Flags/romania.gif
+share/doc/mysql/Flags/russia.gif
+share/doc/mysql/Flags/singapore.gif
+share/doc/mysql/Flags/south-africa.gif
+share/doc/mysql/Flags/south-africa1.gif
+share/doc/mysql/Flags/south-korea.gif
+share/doc/mysql/Flags/spain.gif
+share/doc/mysql/Flags/sweden.gif
+share/doc/mysql/Flags/switzerland.gif
+share/doc/mysql/Flags/taiwan.gif
+share/doc/mysql/Flags/ukraine.gif
+share/doc/mysql/Flags/usa.gif
 share/doc/mysql/manual.html
 share/doc/mysql/manual.ps
 share/doc/mysql/manual.txt
 share/doc/mysql/manual_toc.html
 share/mysql/binary-configure
+share/mysql/charsets/Index
+share/mysql/charsets/README
+share/mysql/charsets/cp1251.conf
+share/mysql/charsets/cp1257.conf
+share/mysql/charsets/croat.conf
+share/mysql/charsets/danish.conf
+share/mysql/charsets/dec8.conf
+share/mysql/charsets/dos.conf
+share/mysql/charsets/estonia.conf
+share/mysql/charsets/german1.conf
+share/mysql/charsets/greek.conf
+share/mysql/charsets/hebrew.conf
+share/mysql/charsets/hp8.conf
+share/mysql/charsets/hungarian.conf
+share/mysql/charsets/koi8_ru.conf
+share/mysql/charsets/koi8_ukr.conf
+share/mysql/charsets/latin1.conf
+share/mysql/charsets/latin2.conf
+share/mysql/charsets/latin5.conf
+share/mysql/charsets/swe7.conf
+share/mysql/charsets/usa7.conf
+share/mysql/charsets/win1250.conf
+share/mysql/charsets/win1251.conf
+share/mysql/charsets/win1251ukr.conf
 share/mysql/czech/errmsg.sys
 share/mysql/czech/errmsg.txt
 share/mysql/danish/errmsg.sys
@@ -108,8 +157,8 @@ share/mysql/dutch/errmsg.sys
 share/mysql/dutch/errmsg.txt
 share/mysql/english/errmsg.sys
 share/mysql/english/errmsg.txt
-share/mysql/estonia/errmsg.sys
-share/mysql/estonia/errmsg.txt
+share/mysql/estonian/errmsg.sys
+share/mysql/estonian/errmsg.txt
 share/mysql/french/errmsg.sys
 share/mysql/french/errmsg.txt
 share/mysql/german/errmsg.sys
@@ -125,8 +174,13 @@ share/mysql/japanese/errmsg.txt
 share/mysql/korean/errmsg.sys
 share/mysql/korean/errmsg.txt
 share/mysql/make_binary_distribution
-share/mysql/my-example.cnf
-share/mysql/mysql-3.22.32.spec
+share/mysql/mi_test_all
+share/mysql/mi_test_all.res
+share/mysql/my-huge.cnf
+share/mysql/my-large.cnf
+share/mysql/my-medium.cnf
+share/mysql/my-small.cnf
+share/mysql/mysql-3.23.31.spec
 share/mysql/mysql-log-rotate
 share/mysql/mysql.server
 share/mysql/norwegian-ny/errmsg.sys
@@ -137,6 +191,8 @@ share/mysql/polish/errmsg.sys
 share/mysql/polish/errmsg.txt
 share/mysql/portuguese/errmsg.sys
 share/mysql/portuguese/errmsg.txt
+share/mysql/romanian/errmsg.sys
+share/mysql/romanian/errmsg.txt
 share/mysql/russian/errmsg.sys
 share/mysql/russian/errmsg.txt
 share/mysql/slovak/errmsg.sys
@@ -147,13 +203,14 @@ share/mysql/swedish/errmsg.sys
 share/mysql/swedish/errmsg.txt
 @dirrm include/mysql
 @dirrm lib/mysql
-@dirrm share/doc/mysql/Img
+@dirrm share/doc/mysql/Flags
 @dirrm share/doc/mysql
+@dirrm share/mysql/charsets
 @dirrm share/mysql/czech
 @dirrm share/mysql/danish
 @dirrm share/mysql/dutch
 @dirrm share/mysql/english
-@dirrm share/mysql/estonia
+@dirrm share/mysql/estonian
 @dirrm share/mysql/french
 @dirrm share/mysql/german
 @dirrm share/mysql/greek
@@ -165,6 +222,7 @@ share/mysql/swedish/errmsg.txt
 @dirrm share/mysql/norwegian-ny
 @dirrm share/mysql/polish
 @dirrm share/mysql/portuguese
+@dirrm share/mysql/romanian
 @dirrm share/mysql/russian
 @dirrm share/mysql/slovak
 @dirrm share/mysql/spanish