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

12 files changed, 65 insertions, 63 deletions

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() != '/'))
        {