Update mysql4-* to 4.1.8a.

Please check http://dev.mysql.com/doc/mysql/en/News-4.1.8.html to
see the list of changes, new features added and a bunch of bugs were
fixed.

10 files changed, 88 insertions, 115 deletions

diff --git a/databases/mysql4-server/patches/patch-aa b/databases/mysql4-server/patches/patch-aa
index bb3c0267cf2..6910bb9d064 100644
--- a/databases/mysql4-server/patches/patch-aa
+++ b/databases/mysql4-server/patches/patch-aa
@@ -1,20 +1,19 @@
-$NetBSD: patch-aa,v 1.5 2004/10/28 01:12:44 xtraeme Exp $
+$NetBSD: patch-aa,v 1.6 2005/01/10 15:47:18 xtraeme Exp $
 
---- Makefile.in.orig	2004-10-27 23:20:22.000000000 +0200
-+++ Makefile.in	2004-10-27 23:20:52.000000000 +0200
-@@ -301,13 +301,8 @@
+--- Makefile.in.orig	2005-01-10 16:09:00.000000000 +0100
++++ Makefile.in	2005-01-10 16:09:25.000000000 +0100
+@@ -338,12 +338,8 @@
  
  # These are built from source in the Docs directory
  EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
 -SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
 -			@readline_topdir@ sql-common \
--			@thread_dirs@ pstack @sql_client_dirs@ \
--			@sql_server_dirs@ scripts man tests \
+-			@thread_dirs@ pstack \
+-			@sql_server_dirs@ @sql_client_dirs@ scripts man tests \
 -			netware @libmysqld_dirs@ \
 -			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
--
 +SUBDIRS = . include @thread_dirs@ pstack @sql_server_dirs@ tests \
-+		@bench_dirs@ support-files
++	  @bench_dirs@ support-files
  
  DIST_SUBDIRS = . include @docs_dirs@ zlib \
  			@readline_topdir@ sql-common \
diff --git a/databases/mysql4-server/patches/patch-ab b/databases/mysql4-server/patches/patch-ab
index 1587732d0a5..91dc12afb6b 100644
--- a/databases/mysql4-server/patches/patch-ab
+++ b/databases/mysql4-server/patches/patch-ab
@@ -1,31 +1,31 @@
-$NetBSD: patch-ab,v 1.1 2004/10/28 01:12:44 xtraeme Exp $
+$NetBSD: patch-ab,v 1.2 2005/01/10 15:47:18 xtraeme Exp $
 
---- tests/Makefile.in.orig	2004-10-27 23:47:23.000000000 +0200
-+++ tests/Makefile.in	2004-10-27 23:47:53.000000000 +0200
-@@ -315,7 +315,7 @@
- # C Test for 4.1 protocol
- #
- INCLUDES = -I$(top_srcdir)/include $(openssl_includes)
--LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysql/libmysqlclient.la
-+LDADD = @CLIENT_EXTRA_LDFLAGS@ -lmysqlclient
- client_test_LDADD = $(LDADD) $(CXXLDFLAGS)
- client_test_SOURCES = client_test.c
- insert_test_DEPENDENCIES = $(LIBRARIES) $(pkglib_LTLIBRARIES)
-@@ -332,7 +332,7 @@
- 
+--- tests/Makefile.in.orig	2005-01-10 16:09:56.000000000 +0100
++++ tests/Makefile.in	2005-01-10 16:11:05.000000000 +0100
+@@ -74,7 +74,7 @@
+ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
  am_client_test_OBJECTS = client_test.$(OBJEXT)
  client_test_OBJECTS = $(am_client_test_OBJECTS)
--client_test_DEPENDENCIES = ../libmysql/libmysqlclient.la
-+client_test_DEPENDENCIES =
- client_test_LDFLAGS =
+-am__DEPENDENCIES_1 = ../libmysql/libmysqlclient.la
++am__DEPENDENCIES_1 = 
+ am__DEPENDENCIES_2 =
+ client_test_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
  insert_test_SOURCES = insert_test.c
- insert_test_OBJECTS = insert_test.$(OBJEXT)
-@@ -345,7 +345,7 @@
+@@ -86,7 +86,7 @@
  thread_test_SOURCES = thread_test.c
  thread_test_OBJECTS = thread_test.$(OBJEXT)
  thread_test_LDADD = $(LDADD)
 -thread_test_DEPENDENCIES = ../libmysql/libmysqlclient.la
 +thread_test_DEPENDENCIES =
- thread_test_LDFLAGS =
- 
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -368,7 +368,7 @@
+ # C Test for 4.1 protocol
+ #
+ INCLUDES = -I$(top_srcdir)/include $(openssl_includes)
+-LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysql/libmysqlclient.la
++LDADD = @CLIENT_EXTRA_LDFLAGS@ -lmysqlclient
+ client_test_LDADD = $(LDADD) $(CXXLDFLAGS)
+ client_test_SOURCES = client_test.c
+ insert_test_DEPENDENCIES = $(LIBRARIES) $(pkglib_LTLIBRARIES)
diff --git a/databases/mysql4-server/patches/patch-ac b/databases/mysql4-server/patches/patch-ac
index 3b1d710b4ad..5e974d72aac 100644
--- a/databases/mysql4-server/patches/patch-ac
+++ b/databases/mysql4-server/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.1 2004/10/28 01:12:44 xtraeme Exp $
+$NetBSD: patch-ac,v 1.2 2005/01/10 15:47:18 xtraeme Exp $
 
---- mysql-test/Makefile.in.orig	2004-10-27 23:51:22.000000000 +0200
-+++ mysql-test/Makefile.in	2004-10-27 23:51:48.000000000 +0200
-@@ -305,7 +305,7 @@
+--- mysql-test/Makefile.in.orig	2005-01-10 16:11:33.000000000 +0100
++++ mysql-test/Makefile.in	2005-01-10 16:11:53.000000000 +0100
+@@ -355,7 +355,7 @@
+ @HAVE_NDBCLUSTER_DB_FALSE@DIST_SUBDIRS = 
  @HAVE_NDBCLUSTER_DB_TRUE@DIST_SUBDIRS = ndb
- 
  benchdir_root = $(prefix)
 -testdir = $(benchdir_root)/mysql-test
 +testdir = $(benchdir_root)/share/mysql-test
diff --git a/databases/mysql4-server/patches/patch-af b/databases/mysql4-server/patches/patch-af
index 8a76a1162af..83bd13628df 100644
--- a/databases/mysql4-server/patches/patch-af
+++ b/databases/mysql4-server/patches/patch-af
@@ -1,26 +1,8 @@
-$NetBSD: patch-af,v 1.6 2004/11/08 18:19:41 xtraeme Exp $
+$NetBSD: patch-af,v 1.7 2005/01/10 15:47:18 xtraeme Exp $
 
---- configure.orig	2004-10-23 17:29:20.000000000 +1000
-+++ configure
-@@ -23040,7 +23040,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- int
- main ()
- {
--int link_test() { return compress(0, (unsigned long*) 0, "", 0); }
-+return compress(0, (unsigned long*) 0, "", 0);
-   ;
-   return 0;
- }
-@@ -23109,7 +23109,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- int
- main ()
- {
--int link_test() { return compress(0, (unsigned long*) 0, "", 0); }
-+return compress(0, (unsigned long*) 0, "", 0);
-   ;
-   return 0;
- }
-@@ -34120,30 +34120,10 @@ else
+--- configure.orig	2005-01-10 16:12:40.000000000 +0100
++++ configure	2005-01-10 16:12:52.000000000 +0100
+@@ -36429,33 +36429,10 @@
  fi;
  
  
@@ -48,15 +30,9 @@ $NetBSD: patch-af,v 1.6 2004/11/08 18:19:41 xtraeme Exp $
 -  echo "$as_me:$LINENO: result: not found" >&5
 -echo "${ECHO_T}not found" >&6
 -fi
+-
+-
+-
  
  
- 
-@@ -34422,7 +34402,7 @@ then
- else
-   bench_dirs=""
- fi
--bench_dirs="$bench_dirs mysql-test"
-+bench_dirs="$bench_dirs mysql-test"
- 
- 
- # Don't build readline, i have it already
+   echo "$as_me:$LINENO: checking if we should build MySQLFS" >&5
diff --git a/databases/mysql4-server/patches/patch-aq b/databases/mysql4-server/patches/patch-aq
index 2728505edde..de3fd65629b 100644
--- a/databases/mysql4-server/patches/patch-aq
+++ b/databases/mysql4-server/patches/patch-aq
@@ -1,11 +1,11 @@
-$NetBSD: patch-aq,v 1.4 2004/10/28 01:12:44 xtraeme Exp $
+$NetBSD: patch-aq,v 1.5 2005/01/10 15:47:18 xtraeme Exp $
 
---- include/Makefile.in.orig	2004-10-27 23:27:39.000000000 +0200
-+++ include/Makefile.in	2004-10-27 23:28:13.000000000 +0200
-@@ -296,14 +296,8 @@
+--- 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 @@
+ vio_dir = @vio_dir@
  vio_libs = @vio_libs@
  zlib_dir = @zlib_dir@
- 
 -BUILT_SOURCES = mysql_version.h m_ctype.h my_config.h
 -pkginclude_HEADERS = my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \
 -			mysql.h mysql_com.h mysqld_error.h mysql_embed.h \
@@ -14,8 +14,8 @@ $NetBSD: patch-aq,v 1.4 2004/10/28 01:12:44 xtraeme Exp $
 -			my_getopt.h sslopt-longopts.h my_dir.h typelib.h \
 -			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
 -			sql_state.h mysql_time.h $(BUILT_SOURCES)
-+BUILT_SOURCES = 
-+pkginclude_HEADERS = $(BUILT_SOURCES)
++BUILT_SOURCES =
++pkginclude_HEADERS = 
  
  noinst_HEADERS = config-win.h config-os2.h config-netware.h \
  			nisam.h heap.h merge.h my_bitmap.h\
diff --git a/databases/mysql4-server/patches/patch-ar b/databases/mysql4-server/patches/patch-ar
index 711485ea276..f86841eb9f3 100644
--- a/databases/mysql4-server/patches/patch-ar
+++ b/databases/mysql4-server/patches/patch-ar
@@ -1,23 +1,21 @@
-$NetBSD: patch-ar,v 1.5 2004/10/28 01:12:44 xtraeme Exp $
+$NetBSD: patch-ar,v 1.6 2005/01/10 15:47:18 xtraeme Exp $
 
---- man/Makefile.in.orig	2004-10-27 23:28:38.000000000 +0200
-+++ man/Makefile.in	2004-10-27 23:29:04.000000000 +0200
-@@ -296,16 +296,8 @@
+--- man/Makefile.in.orig	2005-01-10 16:14:50.000000000 +0100
++++ man/Makefile.in	2005-01-10 16:15:51.000000000 +0100
+@@ -313,14 +313,8 @@
+ vio_dir = @vio_dir@
  vio_libs = @vio_libs@
  zlib_dir = @zlib_dir@
- 
 -man_MANS = mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 \
 -		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \
 -		perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1
 -
--
 -EXTRA_DIST = mysql.1.in isamchk.1.in isamlog.1.in mysql_zap.1.in \
 -		mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \
 -		mysqldump.1.in mysqlshow.1.in perror.1.in replace.1.in mysqlman.1.in \
 -		mysqld_safe.1.in mysql_fix_privilege_tables.1.in
--
 +man_MANS = mysqld.1 mysqld_multi.1
-+EXTRA_DITS = mysqld.1.in mysqld_multi.1.in
++EXTRA_DIST = mysqld.1.in mysqld_multi.1.in
  
  CLEANFILES = $(man_MANS)
- 
+ SUFFIXES = .in
diff --git a/databases/mysql4-server/patches/patch-as b/databases/mysql4-server/patches/patch-as
index b9b4db954ac..feb80200a3d 100644
--- a/databases/mysql4-server/patches/patch-as
+++ b/databases/mysql4-server/patches/patch-as
@@ -1,11 +1,11 @@
-$NetBSD: patch-as,v 1.5 2004/10/28 01:12:44 xtraeme Exp $
+$NetBSD: patch-as,v 1.6 2005/01/10 15:47:18 xtraeme Exp $
 
---- support-files/Makefile.in.orig	2004-10-27 23:29:31.000000000 +0200
-+++ support-files/Makefile.in	2004-10-27 23:29:50.000000000 +0200
-@@ -311,15 +311,7 @@
+--- support-files/Makefile.in.orig	2005-01-10 16:16:28.000000000 +0100
++++ support-files/Makefile.in	2005-01-10 16:16:50.000000000 +0100
+@@ -338,14 +338,7 @@
+ 			MySQL-shared-compat.spec.sh
  
  SUBDIRS = MacOSX
- 
 -pkgdata_DATA = my-small.cnf \
 -			my-medium.cnf \
 -			my-large.cnf \
@@ -14,8 +14,7 @@ $NetBSD: patch-as,v 1.5 2004/10/28 01:12:44 xtraeme Exp $
 -			mysql-log-rotate \
 -			mysql-@VERSION@.spec \
 -			MySQL-shared-compat.spec
--
-+pkgdata_DATA = 
++pkgdata_DATA =
  
  pkgdata_SCRIPTS = mysql.server
- 
+ CLEANFILES = my-small.cnf \
diff --git a/databases/mysql4-server/patches/patch-at b/databases/mysql4-server/patches/patch-at
index ef0127e9b69..b6975fe6615 100644
--- a/databases/mysql4-server/patches/patch-at
+++ b/databases/mysql4-server/patches/patch-at
@@ -1,17 +1,18 @@
-$NetBSD: patch-at,v 1.2 2004/03/07 19:42:55 martti Exp $
+$NetBSD: patch-at,v 1.3 2005/01/10 15:47:18 xtraeme Exp $
 
---- support-files/MacOSX/Makefile.in.orig	Tue Feb 10 20:16:53 2004
-+++ support-files/MacOSX/Makefile.in	Sun Mar  7 20:22:21 2004
-@@ -284,11 +284,7 @@
+--- support-files/MacOSX/Makefile.in.orig	2005-01-10 16:17:30.000000000 +0100
++++ support-files/MacOSX/Makefile.in	2005-01-10 16:17:48.000000000 +0100
+@@ -324,12 +324,7 @@
+ 		StartupItem.Info.plist \
  		StartupItem.postinstall
  
- 
 -pkgdata_DATA = Info.plist \
 -		Description.plist \
 -		StartupParameters.plist \
 -		postinstall \
 -		preinstall
-+pkgdata_DATA =
- 
- 
+-
++pkgdata_DATA = 
  CLEANFILES = Info.plist \
+ 		Description.plist \
+ 		StartupParameters.plist \
diff --git a/databases/mysql4-server/patches/patch-aw b/databases/mysql4-server/patches/patch-aw
index db5cafd47f6..b08ef246d8c 100644
--- a/databases/mysql4-server/patches/patch-aw
+++ b/databases/mysql4-server/patches/patch-aw
@@ -1,13 +1,13 @@
-$NetBSD: patch-aw,v 1.1 2004/03/13 12:09:37 recht Exp $
+$NetBSD: patch-aw,v 1.2 2005/01/10 15:47:18 xtraeme Exp $
 
---- isam/Makefile.in.orig	2004-02-10 19:16:49.000000000 +0100
-+++ isam/Makefile.in	2004-03-13 12:26:18.000000000 +0100
-@@ -370,7 +370,7 @@
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
- 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+--- isam/Makefile.in.orig	2005-01-10 16:18:20.000000000 +0100
++++ isam/Makefile.in	2005-01-10 16:18:31.000000000 +0100
+@@ -134,7 +134,7 @@
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
 -CCLD = $(CC)
 +CCLD = $(CXX)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- DIST_SOURCES = $(libnisam_a_SOURCES) $(isamchk_SOURCES) isamlog.c \
+ SOURCES = $(libnisam_a_SOURCES) $(isamchk_SOURCES) isamlog.c \
diff --git a/databases/mysql4-server/patches/patch-ax b/databases/mysql4-server/patches/patch-ax
index f3afd82bb8c..bee839f38c3 100644
--- a/databases/mysql4-server/patches/patch-ax
+++ b/databases/mysql4-server/patches/patch-ax
@@ -1,13 +1,13 @@
-$NetBSD: patch-ax,v 1.1 2004/03/13 12:09:37 recht Exp $
+$NetBSD: patch-ax,v 1.2 2005/01/10 15:47:18 xtraeme Exp $
 
---- myisam/Makefile.in.orig	2004-03-13 12:38:20.000000000 +0100
-+++ myisam/Makefile.in	2004-03-13 12:38:46.000000000 +0100
-@@ -407,7 +407,7 @@
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
- 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+--- myisam/Makefile.in.orig	2005-01-10 16:19:12.000000000 +0100
++++ myisam/Makefile.in	2005-01-10 16:19:21.000000000 +0100
+@@ -172,7 +172,7 @@
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
 -CCLD = $(CC)
 +CCLD = $(CXX)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- DIST_SOURCES = $(libmyisam_a_SOURCES) mi_test1.c mi_test2.c mi_test3.c \
+ SOURCES = $(libmyisam_a_SOURCES) mi_test1.c mi_test2.c mi_test3.c \