Updated MySQL to 4.1.22

Lots of bug fixes, see http://dev.mysql.com/doc/refman/4.1/en/news-4-1-22.html

26 files changed, 151 insertions, 144 deletions

diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
index 6468ff64c33..e167c5ff47b 100644
--- a/databases/mysql4-client/Makefile.common
+++ b/databases/mysql4-client/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.56 2007/05/22 10:47:37 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.57 2007/05/23 08:11:48 martti Exp $
 
-DISTNAME=		mysql-4.1.21
+DISTNAME=		mysql-4.1.22
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_MYSQL:=MySQL-4.1/}
 
diff --git a/databases/mysql4-client/buildlink3.mk b/databases/mysql4-client/buildlink3.mk
index 7d712a29a0f..1a24f3dbe36 100644
--- a/databases/mysql4-client/buildlink3.mk
+++ b/databases/mysql4-client/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/07/08 23:10:40 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2007/05/23 08:11:48 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MYSQL_CLIENT_BUILDLINK3_MK:=	${MYSQL_CLIENT_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	mysql-client
 .endif
 
@@ -11,14 +11,14 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmysql-client}
 BUILDLINK_PACKAGES+=	mysql-client
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mysql-client
 
-.if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.mysql-client+=	mysql-client>=4.1.7
-BUILDLINK_ABI_DEPENDS.mysql-client+=	mysql-client>=4.1.15nb1
+.if ${MYSQL_CLIENT_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.mysql-client+=	mysql-client>=4.1.22
 BUILDLINK_PKGSRCDIR.mysql-client?=	../../databases/mysql4-client
 BUILDLINK_LIBDIRS.mysql-client?=	lib/mysql
 BUILDLINK_INCDIRS.mysql-client?=	include/mysql
 .endif	# MYSQL_CLIENT_BUILDLINK3_MK
 
+.include "../../devel/readline/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 
diff --git a/databases/mysql4-client/distinfo b/databases/mysql4-client/distinfo
index a206e97601e..ffa0df556b7 100644
--- a/databases/mysql4-client/distinfo
+++ b/databases/mysql4-client/distinfo
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.28 2006/10/08 13:29:06 rillig Exp $
+$NetBSD: distinfo,v 1.29 2007/05/23 08:11:49 martti Exp $
 
-SHA1 (mysql-4.1.21.tar.gz) = ec761b42d640e4dd051bff939fdcd2895b0e2591
-RMD160 (mysql-4.1.21.tar.gz) = a8e92bb3b1371cde3fd938482b34cb597403debf
-Size (mysql-4.1.21.tar.gz) = 17624947 bytes
+SHA1 (mysql-4.1.22.tar.gz) = 857e942cc3207caf56e2aa48961fc1ed66d932e6
+RMD160 (mysql-4.1.22.tar.gz) = bfcf5058e4247cf4d7d1550ea54c64ebc8bc615e
+Size (mysql-4.1.22.tar.gz) = 17761101 bytes
 SHA1 (patch-aa) = adc6956d4be304db61aa0323061143fffc1b9751
-SHA1 (patch-ab) = 0959e0ba7316e4fe00b656d7af2d8c2c04ed296f
-SHA1 (patch-af) = fd55cd066ac78601dc12002959d2bfafe243f65b
-SHA1 (patch-av) = 5bb6b9e90b6537d4fad71fb575986b49e56161e0
-SHA1 (patch-aw) = 8e7ad98457ab0b2b96d18cc414b6a773eb564dcc
-SHA1 (patch-ax) = 9ad64516523d6052dca586c6a427a1c64921b891
-SHA1 (patch-ay) = fa4a55fa0df5b92823f2390e42fe46e728aadb25
-SHA1 (patch-ba) = bd34391e522ae12ee63ec6a734f7a31116b2918d
+SHA1 (patch-ab) = ca126aec7649dbe12663df30fc2223e256df5883
+SHA1 (patch-af) = 0164d5c00600720591cae36b71625660cdb97625
+SHA1 (patch-av) = e1578d1e9742a8317565986bd6ae9a38e0dd5fad
+SHA1 (patch-aw) = 35b3aafe923d44d287abd9d30b2a39b347386102
+SHA1 (patch-ax) = 719c1fdd38f494d097c9340f77e1c3264e084b8c
+SHA1 (patch-ay) = 3edcdd5b6e5a3d9e87f4fc83ff91dfebbeaf3b61
+SHA1 (patch-ba) = 73f89008fc6a1f37c573dce00fdde3965234e211
 SHA1 (patch-bb) = 242c97ab4658838a6001d9c288e01209abfcee77
 SHA1 (patch-bc) = 31c933a03e2b05aeaff1d89d3fa542aad663e96a
-SHA1 (patch-bd) = 2070c5946ceea4c1b79ce290d359a811996ce454
-SHA1 (patch-be) = 1ba51c75cec53cb4bd6d1b5e71f776869cc340ac
+SHA1 (patch-bd) = 32186a1f75d25f4feb95ba9d934dfcb526882681
+SHA1 (patch-be) = 977348504adeea29afb211cf0da8aa42e9c096d9
 SHA1 (patch-bf) = c63133d40c2008ba57a968af693173a1fd97a927
diff --git a/databases/mysql4-client/patches/patch-ab b/databases/mysql4-client/patches/patch-ab
index 54f0371d946..7d166ba04de 100644
--- a/databases/mysql4-client/patches/patch-ab
+++ b/databases/mysql4-client/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2005/10/26 17:33:49 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2007/05/23 08:11:49 martti Exp $
 
---- sql/mysqld.cc.orig	2005-10-14 10:21:12.000000000 +0000
-+++ sql/mysqld.cc
-@@ -182,7 +182,7 @@ static void getvolumeID(BYTE *volumeName
+--- sql/mysqld.cc.orig	2006-11-03 04:15:29.000000000 +0200
++++ sql/mysqld.cc	2007-05-23 08:20:22.000000000 +0300
+@@ -183,7 +183,7 @@
  int initgroups(const char *,unsigned int);
  #endif
  
diff --git a/databases/mysql4-client/patches/patch-af b/databases/mysql4-client/patches/patch-af
index 64f314edc27..06bb5dc80a3 100644
--- a/databases/mysql4-client/patches/patch-af
+++ b/databases/mysql4-client/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.8 2006/05/26 18:25:34 seb Exp $
+$NetBSD: patch-af,v 1.9 2007/05/23 08:11:49 martti Exp $
 
---- configure.orig	2006-05-23 01:12:19.000000000 +0000
-+++ configure
-@@ -20463,7 +20463,7 @@ then
+--- configure.orig	2006-11-03 04:19:18.000000000 +0200
++++ configure	2007-05-23 08:20:46.000000000 +0300
+@@ -20547,7 +20547,7 @@
    FIND_PROC="$PS \$\$PID | grep -v grep | grep mysqld > /dev/null"
  else
    case $SYSTEM_TYPE in
@@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.8 2006/05/26 18:25:34 seb Exp $
        FIND_PROC="$PS p \$\$PID | grep -v grep | grep mysqld > /dev/null"
        ;;
      *darwin*)
-@@ -24651,6 +24651,10 @@ case $SYSTEM_TYPE in
+@@ -24736,6 +24736,10 @@
        MAX_C_OPTIMIZE="-O"
      fi
      ;;
@@ -22,7 +22,7 @@ $NetBSD: patch-af,v 1.8 2006/05/26 18:25:34 seb Exp $
    *freebsd*)
      echo "Adding fix for interrupted reads"
      OSVERSION=`sysctl -a | grep osreldate | awk '{ print $2 }'`
-@@ -36551,30 +36555,10 @@ else
+@@ -36636,30 +36640,10 @@
  fi;
  
  
@@ -53,7 +53,7 @@ $NetBSD: patch-af,v 1.8 2006/05/26 18:25:34 seb Exp $
  
  
  
-@@ -36864,7 +36848,7 @@ then
+@@ -36954,7 +36938,7 @@
  else
    bench_dirs=""
  fi
@@ -62,7 +62,7 @@ $NetBSD: patch-af,v 1.8 2006/05/26 18:25:34 seb Exp $
  
  
  # Don't build readline, i have it already
-@@ -36981,7 +36965,7 @@ int
+@@ -37071,7 +37055,7 @@
  main ()
  {
  
diff --git a/databases/mysql4-client/patches/patch-av b/databases/mysql4-client/patches/patch-av
index 9419ccbcf79..f72ef918c7f 100644
--- a/databases/mysql4-client/patches/patch-av
+++ b/databases/mysql4-client/patches/patch-av
@@ -1,8 +1,8 @@
-$NetBSD: patch-av,v 1.5 2006/05/26 18:25:34 seb Exp $
+$NetBSD: patch-av,v 1.6 2007/05/23 08:11:49 martti Exp $
 
---- Makefile.in.orig	2006-04-29 05:36:56.000000000 +0000
-+++ Makefile.in
-@@ -352,13 +352,7 @@ AUTOMAKE_OPTIONS = foreign
+--- Makefile.in.orig	2006-11-03 04:19:15.000000000 +0200
++++ Makefile.in	2007-05-23 08:21:08.000000000 +0300
+@@ -353,13 +353,7 @@
  EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
  			README COPYING EXCEPTIONS-CLIENT
  
diff --git a/databases/mysql4-client/patches/patch-aw b/databases/mysql4-client/patches/patch-aw
index fa0017bd0d3..c7dc06f56ff 100644
--- a/databases/mysql4-client/patches/patch-aw
+++ b/databases/mysql4-client/patches/patch-aw
@@ -1,13 +1,15 @@
-$NetBSD: patch-aw,v 1.3 2006/05/26 18:25:34 seb Exp $
+$NetBSD: patch-aw,v 1.4 2007/05/23 08:11:49 martti Exp $
 
---- man/Makefile.in.orig	2006-04-29 05:36:31.000000000 +0000
-+++ man/Makefile.in
-@@ -325,7 +325,7 @@ uname_prog = @uname_prog@
+--- man/Makefile.in.orig	2006-11-03 04:18:34.000000000 +0200
++++ man/Makefile.in	2007-05-23 08:40:58.000000000 +0300
+@@ -327,8 +327,8 @@
  vio_dir = @vio_dir@
  vio_libs = @vio_libs@
  zlib_dir = @zlib_dir@
 -man1_MANS = @man1_files@
+-man8_MANS = @man8_files@
 +man1_MANS = msql2mysql.1 mysql.1 mysql_config.1 mysql_fix_privilege_tables.1 mysql_zap.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 mysqldump.1 mysqlshow.1
- EXTRA_DIST = $(man1_MANS)
++man8_MANS =
+ EXTRA_DIST = $(man1_MANS) $(man8_MANS)
  all: all-am
  
diff --git a/databases/mysql4-client/patches/patch-ax b/databases/mysql4-client/patches/patch-ax
index 59383de546a..681b1996d00 100644
--- a/databases/mysql4-client/patches/patch-ax
+++ b/databases/mysql4-client/patches/patch-ax
@@ -1,8 +1,8 @@
-$NetBSD: patch-ax,v 1.5 2006/08/31 12:42:42 seb Exp $
+$NetBSD: patch-ax,v 1.6 2007/05/23 08:11:49 martti Exp $
 
---- scripts/Makefile.in.orig	2005-09-26 23:51:54.000000000 +0200
-+++ scripts/Makefile.in	2005-09-26 23:52:22.000000000 +0200
-@@ -322,23 +322,10 @@
+--- scripts/Makefile.in.orig	2006-11-03 04:19:06.000000000 +0200
++++ scripts/Makefile.in	2007-05-23 08:24:33.000000000 +0300
+@@ -335,23 +335,10 @@
  vio_dir = @vio_dir@
  vio_libs = @vio_libs@
  zlib_dir = @zlib_dir@
diff --git a/databases/mysql4-client/patches/patch-ay b/databases/mysql4-client/patches/patch-ay
index 5b63e44efd9..c84a9cf0de1 100644
--- a/databases/mysql4-client/patches/patch-ay
+++ b/databases/mysql4-client/patches/patch-ay
@@ -1,8 +1,8 @@
-$NetBSD: patch-ay,v 1.3 2006/05/26 18:25:34 seb Exp $
+$NetBSD: patch-ay,v 1.4 2007/05/23 08:11:49 martti Exp $
 
---- strings/Makefile.in.orig	2006-04-29 05:36:54.000000000 +0000
-+++ strings/Makefile.in
-@@ -583,7 +583,7 @@ install-pkglibLIBRARIES: $(pkglib_LIBRAR
+--- strings/Makefile.in.orig	2006-11-03 04:19:10.000000000 +0200
++++ strings/Makefile.in	2007-05-23 08:24:57.000000000 +0300
+@@ -584,7 +584,7 @@
  	@$(NORMAL_INSTALL)
  	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
  	@list='$(pkglib_LIBRARIES)'; for p in $$list; do \
@@ -11,7 +11,7 @@ $NetBSD: patch-ay,v 1.3 2006/05/26 18:25:34 seb Exp $
  	    f=$(am__strip_dir) \
  	    echo " $(pkglibLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
  	    $(pkglibLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
-@@ -591,7 +591,7 @@ install-pkglibLIBRARIES: $(pkglib_LIBRAR
+@@ -592,7 +592,7 @@
  	done
  	@$(POST_INSTALL)
  	@list='$(pkglib_LIBRARIES)'; for p in $$list; do \
diff --git a/databases/mysql4-client/patches/patch-ba b/databases/mysql4-client/patches/patch-ba
index a4e8b088202..ffbff48a90d 100644
--- a/databases/mysql4-client/patches/patch-ba
+++ b/databases/mysql4-client/patches/patch-ba
@@ -1,7 +1,7 @@
-$NetBSD: patch-ba,v 1.1 2005/02/18 00:48:05 xtraeme Exp $
+$NetBSD: patch-ba,v 1.2 2007/05/23 08:11:50 martti Exp $
 
---- client/mysql.cc.orig	2005-02-18 01:36:23.000000000 +0100
-+++ client/mysql.cc	2005-02-18 01:38:00.000000000 +0100
+--- client/mysql.cc.orig	2006-11-03 04:15:47.000000000 +0200
++++ client/mysql.cc	2007-05-23 08:25:23.000000000 +0300
 @@ -39,6 +39,9 @@
  #include "my_readline.h"
  #include <signal.h>
@@ -12,7 +12,7 @@ $NetBSD: patch-ba,v 1.1 2005/02/18 00:48:05 xtraeme Exp $
  
  #if defined(USE_LIBEDIT_INTERFACE) && defined(HAVE_LOCALE_H)
  #include <locale.h>
-@@ -408,8 +411,13 @@
+@@ -410,8 +413,13 @@
    if (opt_sigint_ignore)
      signal(SIGINT, SIG_IGN);
    else
diff --git a/databases/mysql4-client/patches/patch-bd b/databases/mysql4-client/patches/patch-bd
index 39e83012da2..84d2e7e389a 100644
--- a/databases/mysql4-client/patches/patch-bd
+++ b/databases/mysql4-client/patches/patch-bd
@@ -1,7 +1,7 @@
-$NetBSD: patch-bd,v 1.2 2006/08/31 12:42:42 seb Exp $
+$NetBSD: patch-bd,v 1.3 2007/05/23 08:11:50 martti Exp $
 
---- tests/mysql_client_test.c.orig	2006-07-19 15:10:41.000000000 +0000
-+++ tests/mysql_client_test.c
+--- tests/mysql_client_test.c.orig	2006-11-03 04:15:21.000000000 +0200
++++ tests/mysql_client_test.c	2007-05-23 08:25:53.000000000 +0300
 @@ -22,6 +22,7 @@
  ***************************************************************************/
  
@@ -10,7 +10,7 @@ $NetBSD: patch-bd,v 1.2 2006/08/31 12:42:42 seb Exp $
  #include <my_sys.h>
  #include <mysql.h>
  #include <errmsg.h>
-@@ -11855,6 +11856,48 @@ static void test_bug15613()
+@@ -11856,6 +11857,48 @@
    mysql_stmt_close(stmt);
  }
  
@@ -59,11 +59,11 @@ $NetBSD: patch-bd,v 1.2 2006/08/31 12:42:42 seb Exp $
  
  /*
   Bug#20152: mysql_stmt_execute() writes to MYSQL_TYPE_DATE buffer
-@@ -12130,6 +12173,7 @@ static struct my_tests_st my_tests[]= {
+@@ -12170,6 +12213,7 @@
    { "test_bug11718", test_bug11718 },
    { "test_bug12925", test_bug12925 },
    { "test_bug15613", test_bug15613 },
 +  { "test_bug17667", test_bug17667 },
    { "test_bug20152", test_bug20152 },
+   { "test_bug21726", test_bug21726 },
    { 0, 0 }
- };
diff --git a/databases/mysql4-client/patches/patch-be b/databases/mysql4-client/patches/patch-be
index 64998b911c8..fa8dc2c710b 100644
--- a/databases/mysql4-client/patches/patch-be
+++ b/databases/mysql4-client/patches/patch-be
@@ -1,8 +1,8 @@
-$NetBSD: patch-be,v 1.1 2006/06/19 07:53:00 seb Exp $
+$NetBSD: patch-be,v 1.2 2007/05/23 08:11:50 martti Exp $
 
---- sql/sql_lex.cc.orig	2006-05-24 18:00:37.000000000 +0000
-+++ sql/sql_lex.cc
-@@ -892,6 +892,8 @@ int yylex(void *arg, void *yythd)
+--- sql/sql_lex.cc.orig	2006-11-03 04:15:21.000000000 +0200
++++ sql/sql_lex.cc	2007-05-23 08:26:27.000000000 +0300
+@@ -894,6 +894,8 @@
        while (lex->ptr != lex->end_of_query &&
  	     ((c=yyGet()) != '*' || yyPeek() != '/'))
        {
diff --git a/databases/mysql4-server/PLIST b/databases/mysql4-server/PLIST
index d71fced975b..f53291ef8a5 100644
--- a/databases/mysql4-server/PLIST
+++ b/databases/mysql4-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2006/08/31 12:42:42 seb Exp $
+@comment $NetBSD: PLIST,v 1.19 2007/05/23 08:11:50 martti Exp $
 bin/comp_err
 bin/isamchk
 bin/isamlog
@@ -43,6 +43,7 @@ man/man1/mysqld_safe.1
 man/man1/pack_isam.1
 man/man1/perror.1
 man/man1/replace.1
+man/man8/mysqld.8
 share/examples/rc.d/mysqld
 share/mysql-test/README
 share/mysql-test/cacert.pem
@@ -112,6 +113,7 @@ share/mysql-test/lib/mtr_misc.pl
 share/mysql-test/lib/mtr_process.pl
 share/mysql-test/lib/mtr_report.pl
 share/mysql-test/lib/mtr_timer.pl
+share/mysql-test/mtr
 share/mysql-test/mysql-test-run
 share/mysql-test/mysql-test-run.pl
 share/mysql-test/r/alias.result
@@ -524,6 +526,7 @@ share/mysql-test/r/windows.result
 share/mysql-test/server-cert.pem
 share/mysql-test/server-key.pem
 share/mysql-test/std_data/Moscow_leap
+share/mysql-test/std_data/bug15328.cnf
 share/mysql-test/std_data/cacert.pem
 share/mysql-test/std_data/client-cert.pem
 share/mysql-test/std_data/client-key.pem
diff --git a/databases/mysql4-server/distinfo b/databases/mysql4-server/distinfo
index 4adbe8466c1..88cc6786436 100644
--- a/databases/mysql4-server/distinfo
+++ b/databases/mysql4-server/distinfo
@@ -1,21 +1,21 @@
-$NetBSD: distinfo,v 1.26 2006/10/15 22:25:41 seb Exp $
+$NetBSD: distinfo,v 1.27 2007/05/23 08:11:50 martti Exp $
 
-SHA1 (mysql-4.1.21.tar.gz) = ec761b42d640e4dd051bff939fdcd2895b0e2591
-RMD160 (mysql-4.1.21.tar.gz) = a8e92bb3b1371cde3fd938482b34cb597403debf
-Size (mysql-4.1.21.tar.gz) = 17624947 bytes
-SHA1 (patch-aa) = f32ae7bbf91ce4edaeccf20789d60ecca82eb062
-SHA1 (patch-ab) = 45f97d4e449c76e46cacba246d5dc9ac8417ec44
-SHA1 (patch-ac) = fd49d78012d6410263da38fb97a8e0369f98c62d
-SHA1 (patch-ad) = 0959e0ba7316e4fe00b656d7af2d8c2c04ed296f
+SHA1 (mysql-4.1.22.tar.gz) = 857e942cc3207caf56e2aa48961fc1ed66d932e6
+RMD160 (mysql-4.1.22.tar.gz) = bfcf5058e4247cf4d7d1550ea54c64ebc8bc615e
+Size (mysql-4.1.22.tar.gz) = 17761101 bytes
+SHA1 (patch-aa) = b6fb450e431b4ec6ebf7bc4b04cd80f7756576c5
+SHA1 (patch-ab) = 1ad80e212ab9fe37f3026ed37dfa8f25371f9216
+SHA1 (patch-ac) = 5d313195f290d1761d3f2f0143f44cd8143a70c5
+SHA1 (patch-ad) = d2a7e9b90c3980090e40e29aa478310ac9862b1f
 SHA1 (patch-ae) = adc6956d4be304db61aa0323061143fffc1b9751
-SHA1 (patch-af) = eb62ce5a52d2311722203c3f2409fe4301e5d724
-SHA1 (patch-al) = 725a3a6e06d39b26efb706bebbe3ff95da82be96
-SHA1 (patch-am) = 07e4016a0629b7737ad4956962c15e97ddcc6f5d
-SHA1 (patch-aq) = b971690206b416e75046cca3e53f6222b55725c5
-SHA1 (patch-ar) = 93cb95b5e4e290fccbaba8d8bd0b66f115868eed
-SHA1 (patch-as) = 516460b0aa9f641d74f83c5514f258a980033e41
+SHA1 (patch-af) = 3189f162cd0088861040e60486878ad42e92bc0d
+SHA1 (patch-al) = 4281434afd098abffde061964e10abf307bd759f
+SHA1 (patch-am) = e809cbead263d80862866f534a58797d1f486a3b
+SHA1 (patch-aq) = d1ec2ddc51159c29c5ada5f5451d2f4c894cd924
+SHA1 (patch-ar) = 834a6c21ddfeacaa964df32d19360b9c90e05857
+SHA1 (patch-as) = 9a983228aae8712c15009015f4e76faa2872d73f
 SHA1 (patch-aw) = e89b4ada1a6efa2d8fb2ddaed8eaca6a59603d38
 SHA1 (patch-ax) = c73f0d59c9e079abc8fc16965297257cb8f8a592
-SHA1 (patch-bd) = 2070c5946ceea4c1b79ce290d359a811996ce454
-SHA1 (patch-be) = 1ba51c75cec53cb4bd6d1b5e71f776869cc340ac
+SHA1 (patch-bd) = 6eb42818196f0a981e7d85fa5791030483a037c4
+SHA1 (patch-be) = 9cb9e8fe550e168a67cd90d0fd7fc6cc9d4029d5
 SHA1 (patch-bf) = 1bbcdd13fa662e2b17114b8b390d16cebccf389c
diff --git a/databases/mysql4-server/patches/patch-aa b/databases/mysql4-server/patches/patch-aa
index 06579ef0ba3..a801b7cb180 100644
--- a/databases/mysql4-server/patches/patch-aa
+++ b/databases/mysql4-server/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2006/05/26 18:25:34 seb Exp $
+$NetBSD: patch-aa,v 1.11 2007/05/23 08:11:50 martti Exp $
 
---- Makefile.in.orig	2006-04-29 05:36:56.000000000 +0000
-+++ Makefile.in
-@@ -352,12 +352,8 @@ AUTOMAKE_OPTIONS = foreign
+--- Makefile.in.orig	2006-11-03 04:19:15.000000000 +0200
++++ Makefile.in	2007-05-23 08:52:06.000000000 +0300
+@@ -353,12 +353,8 @@
  EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
  			README COPYING EXCEPTIONS-CLIENT
  
diff --git a/databases/mysql4-server/patches/patch-ab b/databases/mysql4-server/patches/patch-ab
index d42e555810f..e302e2c5413 100644
--- a/databases/mysql4-server/patches/patch-ab
+++ b/databases/mysql4-server/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2005/07/29 21:02:35 xtraeme Exp $
+$NetBSD: patch-ab,v 1.5 2007/05/23 08:11:50 martti Exp $
 
---- tests/Makefile.in.orig	2005-07-29 22:37:54.000000000 +0200
-+++ tests/Makefile.in	2005-07-29 22:38:46.000000000 +0200
-@@ -77,7 +77,7 @@
+--- tests/Makefile.in.orig	2006-11-03 04:19:11.000000000 +0200
++++ tests/Makefile.in	2007-05-23 08:52:31.000000000 +0300
+@@ -75,7 +75,7 @@
  insert_test_LDADD = $(LDADD)
  am_mysql_client_test_OBJECTS = mysql_client_test.$(OBJEXT)
  mysql_client_test_OBJECTS = $(am_mysql_client_test_OBJECTS)
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.4 2005/07/29 21:02:35 xtraeme Exp $
  am__DEPENDENCIES_2 =
  mysql_client_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_2)
-@@ -87,7 +87,7 @@
+@@ -85,7 +85,7 @@
  thread_test_SOURCES = thread_test.c
  thread_test_OBJECTS = thread_test.$(OBJEXT)
  thread_test_LDADD = $(LDADD)
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.4 2005/07/29 21:02:35 xtraeme Exp $
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
-@@ -377,7 +377,7 @@
+@@ -378,7 +378,7 @@
  INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
  			$(openssl_includes)
  
diff --git a/databases/mysql4-server/patches/patch-ac b/databases/mysql4-server/patches/patch-ac
index c764752c5d0..32857aa3e1d 100644
--- a/databases/mysql4-server/patches/patch-ac
+++ b/databases/mysql4-server/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.6 2006/05/26 18:25:34 seb Exp $
+$NetBSD: patch-ac,v 1.7 2007/05/23 08:11:50 martti Exp $
 
---- mysql-test/Makefile.in.orig	2006-04-29 05:36:32.000000000 +0000
-+++ mysql-test/Makefile.in
-@@ -371,7 +371,7 @@ zlib_dir = @zlib_dir@
+--- mysql-test/Makefile.in.orig	2006-11-03 04:18:36.000000000 +0200
++++ mysql-test/Makefile.in	2007-05-23 08:52:54.000000000 +0300
+@@ -372,7 +372,7 @@
  @HAVE_NDBCLUSTER_DB_FALSE@USE_NDBCLUSTER = \"\"
  @HAVE_NDBCLUSTER_DB_TRUE@USE_NDBCLUSTER = \"--ndbcluster\"
  benchdir_root = $(prefix)
@@ -10,4 +10,4 @@ $NetBSD: patch-ac,v 1.6 2006/05/26 18:25:34 seb Exp $
 +testdir = $(benchdir_root)/share/mysql-test
  EXTRA_SCRIPTS = mysql-test-run.sh install_test_db.sh $(PRESCRIPTS)
  EXTRA_DIST = $(EXTRA_SCRIPTS) 
- GENSCRIPTS = mysql-test-run install_test_db
+ GENSCRIPTS = mysql-test-run install_test_db mtr
diff --git a/databases/mysql4-server/patches/patch-ad b/databases/mysql4-server/patches/patch-ad
index c558b53ecb6..d6bce40425b 100644
--- a/databases/mysql4-server/patches/patch-ad
+++ b/databases/mysql4-server/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2005/10/26 17:33:49 joerg Exp $
+$NetBSD: patch-ad,v 1.2 2007/05/23 08:11:51 martti Exp $
 
---- sql/mysqld.cc.orig	2005-10-14 10:21:12.000000000 +0000
-+++ sql/mysqld.cc
-@@ -182,7 +182,7 @@ static void getvolumeID(BYTE *volumeName
+--- sql/mysqld.cc.orig	2006-11-03 04:15:29.000000000 +0200
++++ sql/mysqld.cc	2007-05-23 08:53:13.000000000 +0300
+@@ -183,7 +183,7 @@
  int initgroups(const char *,unsigned int);
  #endif
  
diff --git a/databases/mysql4-server/patches/patch-af b/databases/mysql4-server/patches/patch-af
index 1811a7f2418..5421002a580 100644
--- a/databases/mysql4-server/patches/patch-af
+++ b/databases/mysql4-server/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.9 2005/10/26 17:33:07 joerg Exp $
+$NetBSD: patch-af,v 1.10 2007/05/23 08:11:51 martti Exp $
 
---- configure.orig	2005-05-13 13:34:04.000000000 +0200
-+++ configure	2005-05-23 15:42:07.000000000 +0200
-@@ -21053,7 +21053,7 @@ then
+--- configure.orig	2006-11-03 04:19:18.000000000 +0200
++++ configure	2007-05-23 08:53:36.000000000 +0300
+@@ -20547,7 +20547,7 @@
    FIND_PROC="$PS \$\$PID | grep -v grep | grep mysqld > /dev/null"
  else
    case $SYSTEM_TYPE in
@@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.9 2005/10/26 17:33:07 joerg Exp $
        FIND_PROC="$PS p \$\$PID | grep -v grep | grep mysqld > /dev/null"
        ;;
      *darwin*)
-@@ -25265,6 +25265,10 @@ case $SYSTEM_TYPE in
+@@ -24736,6 +24736,10 @@
        MAX_C_OPTIMIZE="-O"
      fi
      ;;
@@ -22,7 +22,7 @@ $NetBSD: patch-af,v 1.9 2005/10/26 17:33:07 joerg Exp $
    *freebsd*)
      echo "Adding fix for interrupted reads"
      OSVERSION=`sysctl -a | grep osreldate | awk '{ print $2 }'`
-@@ -37003,33 +37007,10 @@
+@@ -36636,33 +36640,10 @@
  fi;
  
  
@@ -56,7 +56,7 @@ $NetBSD: patch-af,v 1.9 2005/10/26 17:33:07 joerg Exp $
  
  
    echo "$as_me:$LINENO: checking if we should build MySQLFS" >&5
-@@ -37421,7 +37402,7 @@
+@@ -37071,7 +37052,7 @@
  main ()
  {
  
diff --git a/databases/mysql4-server/patches/patch-al b/databases/mysql4-server/patches/patch-al
index e486b1ae93f..3241f0fd2a2 100644
--- a/databases/mysql4-server/patches/patch-al
+++ b/databases/mysql4-server/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.1.1.1 2003/12/20 16:00:43 martti Exp $
+$NetBSD: patch-al,v 1.2 2007/05/23 08:11:51 martti Exp $
 
---- include/my_pthread.h.orig	2003-12-14 21:23:47.000000000 +0000
-+++ include/my_pthread.h	2003-12-20 12:09:31.000000000 +0000
+--- include/my_pthread.h.orig	2006-11-03 04:15:38.000000000 +0200
++++ include/my_pthread.h	2007-05-23 08:54:00.000000000 +0300
 @@ -19,7 +19,13 @@
  #ifndef _my_pthread_h
  #define _my_pthread_h
@@ -16,7 +16,7 @@ $NetBSD: patch-al,v 1.1.1.1 2003/12/20 16:00:43 martti Exp $
  #ifndef ETIME
  #define ETIME ETIMEDOUT				/* For FreeBSD */
  #endif
-@@ -301,7 +307,11 @@
+@@ -297,7 +303,11 @@
  #endif
  
  #ifndef HAVE_NONPOSIX_SIGWAIT
diff --git a/databases/mysql4-server/patches/patch-am b/databases/mysql4-server/patches/patch-am
index 044838c5ad9..f1700df325f 100644
--- a/databases/mysql4-server/patches/patch-am
+++ b/databases/mysql4-server/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.7 2005/03/08 16:48:11 xtraeme Exp $
+$NetBSD: patch-am,v 1.8 2007/05/23 08:11:51 martti Exp $
 
---- scripts/mysqld_safe.sh.orig	2005-01-17 15:16:35.000000000 +0100
-+++ scripts/mysqld_safe.sh	2005-01-17 15:20:03.000000000 +0100
-@@ -253,6 +253,14 @@
+--- scripts/mysqld_safe.sh.orig	2007-05-23 08:51:42.000000000 +0300
++++ scripts/mysqld_safe.sh	2007-05-23 08:54:22.000000000 +0300
+@@ -311,6 +311,14 @@
    fi
  fi
  
@@ -17,7 +17,7 @@ $NetBSD: patch-am,v 1.7 2005/03/08 16:48:11 xtraeme Exp $
  #
  # If there exists an old pid file, check if the daemon is already running
  # Note: The switches to 'ps' may depend on your operating system
-@@ -263,18 +271,16 @@
+@@ -321,18 +329,16 @@
    then
      if @FIND_PROC@
      then    # The pid contains a mysqld process
@@ -40,7 +40,7 @@ $NetBSD: patch-am,v 1.7 2005/03/08 16:48:11 xtraeme Exp $
      exit 1
    fi
  fi
-@@ -287,11 +293,11 @@
+@@ -345,11 +351,11 @@
  # Alternatively, you can start mysqld with the "myisam-recover" option. See
  # the manual for details.
  #
@@ -54,7 +54,7 @@ $NetBSD: patch-am,v 1.7 2005/03/08 16:48:11 xtraeme Exp $
  
  # Does this work on all systems?
  #if type ulimit | grep "shell builtin" > /dev/null
-@@ -299,7 +305,7 @@
+@@ -357,7 +363,7 @@
  #  ulimit -n 256 > /dev/null 2>&1		# Fix for BSD and FreeBSD systems
  #fi
  
@@ -63,7 +63,7 @@ $NetBSD: patch-am,v 1.7 2005/03/08 16:48:11 xtraeme Exp $
  while true
  do
    rm -f $safe_mysql_unix_port $pid_file	# Some extra safety
-@@ -311,7 +317,7 @@
+@@ -369,7 +375,7 @@
    fi
    if test ! -f $pid_file		# This is removed if normal shutdown
    then
@@ -72,7 +72,7 @@ $NetBSD: patch-am,v 1.7 2005/03/08 16:48:11 xtraeme Exp $
      break
    fi
  
-@@ -324,7 +330,7 @@
+@@ -382,7 +388,7 @@
      # kill -9 is used or the process won't react on the kill.
      numofproces=`ps xaww | grep -v "grep" | grep "$ledir/$MYSQLD\>" | grep -c "pid-file=$pid_file"`
  
@@ -81,7 +81,7 @@ $NetBSD: patch-am,v 1.7 2005/03/08 16:48:11 xtraeme Exp $
      I=1
      while test "$I" -le "$numofproces"
      do 
-@@ -337,16 +343,14 @@
+@@ -395,16 +401,14 @@
        #    echo "TEST $I - $T **"
        if kill -9 $T
        then
diff --git a/databases/mysql4-server/patches/patch-aq b/databases/mysql4-server/patches/patch-aq
index de3fd65629b..9c478e3658e 100644
--- a/databases/mysql4-server/patches/patch-aq
+++ b/databases/mysql4-server/patches/patch-aq
@@ -1,8 +1,8 @@
-$NetBSD: patch-aq,v 1.5 2005/01/10 15:47:18 xtraeme Exp $
+$NetBSD: patch-aq,v 1.6 2007/05/23 08:11:51 martti Exp $
 
---- include/Makefile.in.orig	2005-01-10 16:13:53.000000000 +0100
-+++ include/Makefile.in	2005-01-10 16:14:24.000000000 +0100
-@@ -317,14 +317,8 @@
+--- include/Makefile.in.orig	2006-11-03 04:18:30.000000000 +0200
++++ include/Makefile.in	2007-05-23 08:54:47.000000000 +0300
+@@ -336,14 +336,8 @@
  vio_dir = @vio_dir@
  vio_libs = @vio_libs@
  zlib_dir = @zlib_dir@
diff --git a/databases/mysql4-server/patches/patch-ar b/databases/mysql4-server/patches/patch-ar
index e9c44db0add..0a5778cd5c8 100644
--- a/databases/mysql4-server/patches/patch-ar
+++ b/databases/mysql4-server/patches/patch-ar
@@ -1,13 +1,15 @@
-$NetBSD: patch-ar,v 1.7 2006/05/26 18:25:34 seb Exp $
+$NetBSD: patch-ar,v 1.8 2007/05/23 08:11:51 martti Exp $
 
---- man/Makefile.in.orig	2006-04-29 05:36:31.000000000 +0000
-+++ man/Makefile.in
-@@ -325,7 +325,7 @@ uname_prog = @uname_prog@
+--- man/Makefile.in.orig	2006-11-03 04:18:34.000000000 +0200
++++ man/Makefile.in	2007-05-23 08:56:31.000000000 +0300
+@@ -327,8 +327,8 @@
  vio_dir = @vio_dir@
  vio_libs = @vio_libs@
  zlib_dir = @zlib_dir@
 -man1_MANS = @man1_files@
+-man8_MANS = @man8_files@
 +man1_MANS = isamchk.1 isamlog.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 mysql.server.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 pack_isam.1 perror.1 replace.1
- EXTRA_DIST = $(man1_MANS)
++man8_MANS = mysqld.8
+ EXTRA_DIST = $(man1_MANS) $(man8_MANS)
  all: all-am
  
diff --git a/databases/mysql4-server/patches/patch-as b/databases/mysql4-server/patches/patch-as
index 49bdd276fdd..78465bbb7ed 100644
--- a/databases/mysql4-server/patches/patch-as
+++ b/databases/mysql4-server/patches/patch-as
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.8 2005/09/26 22:34:51 xtraeme Exp $
+$NetBSD: patch-as,v 1.9 2007/05/23 08:11:51 martti Exp $
 
---- support-files/Makefile.in.orig	2005-09-27 00:00:34.000000000 +0200
-+++ support-files/Makefile.in	2005-09-27 00:00:57.000000000 +0200
-@@ -345,14 +345,7 @@
+--- support-files/Makefile.in.orig	2006-11-03 04:19:11.000000000 +0200
++++ support-files/Makefile.in	2007-05-23 08:56:53.000000000 +0300
+@@ -358,14 +358,7 @@
  			ndb-config-2-node.ini.sh
  
  SUBDIRS = MacOSX
diff --git a/databases/mysql4-server/patches/patch-bd b/databases/mysql4-server/patches/patch-bd
index 39e83012da2..96c99a15125 100644
--- a/databases/mysql4-server/patches/patch-bd
+++ b/databases/mysql4-server/patches/patch-bd
@@ -1,7 +1,7 @@
-$NetBSD: patch-bd,v 1.2 2006/08/31 12:42:42 seb Exp $
+$NetBSD: patch-bd,v 1.3 2007/05/23 08:11:51 martti Exp $
 
---- tests/mysql_client_test.c.orig	2006-07-19 15:10:41.000000000 +0000
-+++ tests/mysql_client_test.c
+--- tests/mysql_client_test.c.orig	2006-11-03 04:15:21.000000000 +0200
++++ tests/mysql_client_test.c	2007-05-23 08:57:25.000000000 +0300
 @@ -22,6 +22,7 @@
  ***************************************************************************/
  
@@ -10,7 +10,7 @@ $NetBSD: patch-bd,v 1.2 2006/08/31 12:42:42 seb Exp $
  #include <my_sys.h>
  #include <mysql.h>
  #include <errmsg.h>
-@@ -11855,6 +11856,48 @@ static void test_bug15613()
+@@ -11856,6 +11857,48 @@
    mysql_stmt_close(stmt);
  }
  
@@ -59,11 +59,11 @@ $NetBSD: patch-bd,v 1.2 2006/08/31 12:42:42 seb Exp $
  
  /*
   Bug#20152: mysql_stmt_execute() writes to MYSQL_TYPE_DATE buffer
-@@ -12130,6 +12173,7 @@ static struct my_tests_st my_tests[]= {
+@@ -12170,6 +12213,7 @@
    { "test_bug11718", test_bug11718 },
    { "test_bug12925", test_bug12925 },
    { "test_bug15613", test_bug15613 },
 +  { "test_bug17667", test_bug17667 },
    { "test_bug20152", test_bug20152 },
+   { "test_bug21726", test_bug21726 },
    { 0, 0 }
- };
diff --git a/databases/mysql4-server/patches/patch-be b/databases/mysql4-server/patches/patch-be
index 64998b911c8..eee1b3d07e7 100644
--- a/databases/mysql4-server/patches/patch-be
+++ b/databases/mysql4-server/patches/patch-be
@@ -1,8 +1,8 @@
-$NetBSD: patch-be,v 1.1 2006/06/19 07:53:00 seb Exp $
+$NetBSD: patch-be,v 1.2 2007/05/23 08:11:51 martti Exp $
 
---- sql/sql_lex.cc.orig	2006-05-24 18:00:37.000000000 +0000
-+++ sql/sql_lex.cc
-@@ -892,6 +892,8 @@ int yylex(void *arg, void *yythd)
+--- sql/sql_lex.cc.orig	2006-11-03 04:15:21.000000000 +0200
++++ sql/sql_lex.cc	2007-05-23 08:57:51.000000000 +0300
+@@ -894,6 +894,8 @@
        while (lex->ptr != lex->end_of_query &&
  	     ((c=yyGet()) != '*' || yyPeek() != '/'))
        {