Update mysql4-client and mysql4-server to version 4.1.19.

Lots of changes since last packaged version (4.1.15), please see: http://dev.mysql.com/doc/refman/4.1/en/news-4-1-19.html http://dev.mysql.com/doc/refman/4.1/en/news-4-1-18.html http://dev.mysql.com/doc/refman/4.1/en/news-4-1-17.html http://dev.mysql.com/doc/refman/4.1/en/news-4-1-16.html Most notably this version includes a fix for http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-1517 While here install more man pages and merge mysql4-client/patches/patch-ad into mysql4-client/patches/patch-af.
author: seb <seb@pkgsrc.org> 2006-05-26 18:25:34 +0000
committer: seb <seb@pkgsrc.org> 2006-05-26 18:25:34 +0000
commit: 8b4e796d71e99273614fcc4705eab43b63b9436f (patch)
tree: 820912031ef3c1b334725d501760554446e6a609 /databases
parent: fd3934e05e7e5a627afe21240bfb731b3bc758fc (diff)
download: pkgsrc-8b4e796d71e99273614fcc4705eab43b63b9436f.tar.gz
19 files changed, 167 insertions, 168 deletions
diff --git a/databases/mysql4-client/Makefile b/databases/mysql4-client/Makefile
index 5615da7b1c0..02d9f6c30c5 100644
--- a/databases/mysql4-client/Makefile
+++ b/databases/mysql4-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2006/03/30 03:44:41 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/05/26 18:25:34 seb Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
-PKGREVISION=		1
 SVR4_PKGNAME=		mysqc
 COMMENT=		MySQL 4, a free SQL database (client)
 
diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
index 1a1a8544e36..77179d774b1 100644
--- a/databases/mysql4-client/Makefile.common
+++ b/databases/mysql4-client/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.51 2006/04/22 09:22:07 rillig Exp $
+# $NetBSD: Makefile.common,v 1.52 2006/05/26 18:25:34 seb Exp $
 
-DISTNAME=		mysql-4.1.15
+DISTNAME=		mysql-4.1.19
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_MYSQL:=MySQL-4.1/}
 
diff --git a/databases/mysql4-client/PLIST b/databases/mysql4-client/PLIST
index 4f0fb1204e4..67e45e50d25 100644
--- a/databases/mysql4-client/PLIST
+++ b/databases/mysql4-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2006/03/30 03:44:42 jlam Exp $
+@comment $NetBSD: PLIST,v 1.13 2006/05/26 18:25:34 seb Exp $
 bin/msql2mysql
 bin/mysql
 bin/mysql_config
@@ -56,11 +56,15 @@ include/mysql/typelib.h
 info/mysql.info
 lib/mysql/libmysqlclient.la
 lib/mysql/libmysqlclient_r.la
+man/man1/msql2mysql.1
 man/man1/mysql.1
+man/man1/mysql_config.1
 man/man1/mysql_fix_privilege_tables.1
 man/man1/mysql_zap.1
 man/man1/mysqlaccess.1
 man/man1/mysqladmin.1
+man/man1/mysqlbinlog.1
+man/man1/mysqlcheck.1
 man/man1/mysqldump.1
 man/man1/mysqlshow.1
 share/examples/mysql/my-huge.cnf
diff --git a/databases/mysql4-client/distinfo b/databases/mysql4-client/distinfo
index bce4074ac3a..b03acf83e8f 100644
--- a/databases/mysql4-client/distinfo
+++ b/databases/mysql4-client/distinfo
@@ -1,17 +1,15 @@
-$NetBSD: distinfo,v 1.24 2005/10/29 14:14:00 xtraeme Exp $
+$NetBSD: distinfo,v 1.25 2006/05/26 18:25:34 seb Exp $
 
-SHA1 (mysql-4.1.15.tar.gz) = 04e275df6c538117eac9a5ba2ab56e5f01f69286
-RMD160 (mysql-4.1.15.tar.gz) = 07e0c3d5d206f9545cff145cb3ec8db4e395bff0
-Size (mysql-4.1.15.tar.gz) = 17257765 bytes
+SHA1 (mysql-4.1.19.tar.gz) = a1ceee918232891e795be3122ad88fed36c700d5
+RMD160 (mysql-4.1.19.tar.gz) = 8da54a0fa1f024237521de644af32821c6376fab
+Size (mysql-4.1.19.tar.gz) = 17349799 bytes
 SHA1 (patch-aa) = adc6956d4be304db61aa0323061143fffc1b9751
 SHA1 (patch-ab) = 0959e0ba7316e4fe00b656d7af2d8c2c04ed296f
-SHA1 (patch-ac) = 091b9253fd94aaf79d2287b51142a39b482f7192
-SHA1 (patch-ad) = 9d15d073dc07b1ca192a4912c7869024a6e6c7a6
-SHA1 (patch-af) = 2d2f8d6eef794e0d296a1b4fdb118323e4e89b6c
-SHA1 (patch-av) = 6cc37eb4265f31ea0fb0bcf4bf05f84f812e96c9
-SHA1 (patch-aw) = cd03eb6c81a932186370e9ed248d0c7886b7286d
+SHA1 (patch-af) = fd55cd066ac78601dc12002959d2bfafe243f65b
+SHA1 (patch-av) = 5bb6b9e90b6537d4fad71fb575986b49e56161e0
+SHA1 (patch-aw) = 8e7ad98457ab0b2b96d18cc414b6a773eb564dcc
 SHA1 (patch-ax) = 639f60616609b342a44ebd6ae6269a40c4db0767
-SHA1 (patch-ay) = 9b1dfa213491d8daf82ff8d5ee293d1279c64ce8
+SHA1 (patch-ay) = fa4a55fa0df5b92823f2390e42fe46e728aadb25
 SHA1 (patch-ba) = bd34391e522ae12ee63ec6a734f7a31116b2918d
 SHA1 (patch-bb) = 242c97ab4658838a6001d9c288e01209abfcee77
 SHA1 (patch-bc) = 31c933a03e2b05aeaff1d89d3fa542aad663e96a
diff --git a/databases/mysql4-client/patches/patch-ac b/databases/mysql4-client/patches/patch-ac
deleted file mode 100644
index 3d6fcd9062f..00000000000
--- a/databases/mysql4-client/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/10/26 17:33:49 joerg Exp $
-
---- vio/vio.c.orig	2005-10-14 10:23:58.000000000 +0000
-+++ vio/vio.c
-@@ -132,7 +132,7 @@ Vio *vio_new(my_socket sd, enum enum_vio
- 	    vio->sd);
- #if !defined(__WIN__) && !defined(__EMX__) && !defined(OS2)
- #if !defined(NO_FCNTL_NONBLOCK)
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
-     fcntl(sd, F_SETFL, vio->fcntl_mode); /* Yahoo! FreeBSD patch */
- #endif
-     vio->fcntl_mode = fcntl(sd, F_GETFL);
diff --git a/databases/mysql4-client/patches/patch-ad b/databases/mysql4-client/patches/patch-ad
deleted file mode 100644
index 4a016620ddd..00000000000
--- a/databases/mysql4-client/patches/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/10/26 17:33:49 joerg Exp $
-
---- configure.orig	2005-10-14 10:25:05.000000000 +0000
-+++ configure
-@@ -21053,7 +21053,7 @@ then
-   FIND_PROC="$PS \$\$PID | grep -v grep | grep mysqld > /dev/null"
- else
-   case $SYSTEM_TYPE in
--    *freebsd*)
-+    *freebsd* | *dragonfly*)
-       FIND_PROC="$PS p \$\$PID | grep -v grep | grep mysqld > /dev/null"
-       ;;
-     *darwin*)
-@@ -25265,6 +25265,10 @@ case $SYSTEM_TYPE in
-       MAX_C_OPTIMIZE="-O"
-     fi
-     ;;
-+  *dragonfly*)
-+    CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
-+    ;;
-+    
-   *freebsd*)
-     echo "Adding fix for interrupted reads"
-     OSVERSION=`sysctl -a | grep osreldate | awk '{ print $2 }'`
diff --git a/databases/mysql4-client/patches/patch-af b/databases/mysql4-client/patches/patch-af
index 7162eabe02d..64f314edc27 100644
--- a/databases/mysql4-client/patches/patch-af
+++ b/databases/mysql4-client/patches/patch-af
@@ -1,8 +1,28 @@
-$NetBSD: patch-af,v 1.7 2005/05/23 14:00:21 xtraeme Exp $
+$NetBSD: patch-af,v 1.8 2006/05/26 18:25:34 seb Exp $
 
---- configure.orig	2005-05-13 13:34:04.000000000 +0200
-+++ configure	2005-05-23 12:36:42.000000000 +0200
-@@ -37003,30 +37003,10 @@
+--- configure.orig	2006-05-23 01:12:19.000000000 +0000
++++ configure
+@@ -20463,7 +20463,7 @@ then
+   FIND_PROC="$PS \$\$PID | grep -v grep | grep mysqld > /dev/null"
+ else
+   case $SYSTEM_TYPE in
+-    *freebsd*)
++    *freebsd* | *dragonfly*)
+       FIND_PROC="$PS p \$\$PID | grep -v grep | grep mysqld > /dev/null"
+       ;;
+     *darwin*)
+@@ -24651,6 +24651,10 @@ case $SYSTEM_TYPE in
+       MAX_C_OPTIMIZE="-O"
+     fi
+     ;;
++  *dragonfly*)
++    CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
++    ;;
++    
+   *freebsd*)
+     echo "Adding fix for interrupted reads"
+     OSVERSION=`sysctl -a | grep osreldate | awk '{ print $2 }'`
+@@ -36551,30 +36555,10 @@ else
  fi;
  
  
@@ -33,7 +53,7 @@ $NetBSD: patch-af,v 1.7 2005/05/23 14:00:21 xtraeme Exp $
  
  
  
-@@ -37304,7 +37284,7 @@
+@@ -36864,7 +36848,7 @@ then
  else
    bench_dirs=""
  fi
@@ -42,7 +62,7 @@ $NetBSD: patch-af,v 1.7 2005/05/23 14:00:21 xtraeme Exp $
  
  
  # Don't build readline, i have it already
-@@ -37421,7 +37401,7 @@
+@@ -36981,7 +36965,7 @@ int
  main ()
  {
  
diff --git a/databases/mysql4-client/patches/patch-av b/databases/mysql4-client/patches/patch-av
index 6b70fedf44c..9419ccbcf79 100644
--- a/databases/mysql4-client/patches/patch-av
+++ b/databases/mysql4-client/patches/patch-av
@@ -1,18 +1,19 @@
-$NetBSD: patch-av,v 1.4 2005/07/29 21:02:35 xtraeme Exp $
+$NetBSD: patch-av,v 1.5 2006/05/26 18:25:34 seb Exp $
 
---- Makefile.in.orig	2005-07-29 22:25:15.000000000 +0200
-+++ Makefile.in	2005-07-29 22:25:55.000000000 +0200
-@@ -344,12 +344,7 @@
+--- Makefile.in.orig	2006-04-29 05:36:56.000000000 +0000
++++ Makefile.in
+@@ -352,13 +352,7 @@ AUTOMAKE_OPTIONS = foreign
+ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
+ 			README COPYING EXCEPTIONS-CLIENT
  
- # 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_union_dirs@ scripts @man_dirs@ tests \
 -			netware @libmysqld_dirs@ \
 -			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
+-
 +SUBDIRS = . include strings @sql_client_dirs@ scripts man
- 
  DIST_SUBDIRS = . include @docs_dirs@ zlib \
  			@readline_topdir@ sql-common \
+ 			@thread_dirs@ pstack \
diff --git a/databases/mysql4-client/patches/patch-aw b/databases/mysql4-client/patches/patch-aw
index 2fabaa3c178..fa0017bd0d3 100644
--- a/databases/mysql4-client/patches/patch-aw
+++ b/databases/mysql4-client/patches/patch-aw
@@ -1,16 +1,13 @@
-$NetBSD: patch-aw,v 1.2 2005/01/10 15:47:18 xtraeme Exp $
+$NetBSD: patch-aw,v 1.3 2006/05/26 18:25:34 seb Exp $
 
---- man/Makefile.in.orig	2005-01-10 13:41:15.000000000 +0100
-+++ man/Makefile.in	2005-01-10 13:41:46.000000000 +0100
-@@ -313,9 +313,8 @@
+--- man/Makefile.in.orig	2006-04-29 05:36:31.000000000 +0000
++++ man/Makefile.in
+@@ -325,7 +325,7 @@ uname_prog = @uname_prog@
  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
-+man_MANS = mysql.1 mysql_zap.1 mysqlaccess.1 mysqladmin.1 \
-+	   mysqldump.1 mysqlshow.1 mysql_fix_privilege_tables.1
+-man1_MANS = @man1_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)
+ all: all-am
  
- 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 \
diff --git a/databases/mysql4-client/patches/patch-ay b/databases/mysql4-client/patches/patch-ay
index 6d434b619da..5b63e44efd9 100644
--- a/databases/mysql4-client/patches/patch-ay
+++ b/databases/mysql4-client/patches/patch-ay
@@ -1,28 +1,22 @@
-$NetBSD: patch-ay,v 1.2 2005/01/11 22:44:34 xtraeme Exp $
+$NetBSD: patch-ay,v 1.3 2006/05/26 18:25:34 seb Exp $
 
---- strings/Makefile.in.orig	2004-12-27 17:48:04.000000000 +0100
-+++ strings/Makefile.in	2005-01-11 23:29:03.000000000 +0100
-@@ -599,7 +599,6 @@
- 	  if test -f $$p; then \
- 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+--- strings/Makefile.in.orig	2006-04-29 05:36:54.000000000 +0000
++++ strings/Makefile.in
+@@ -583,7 +583,7 @@ install-pkglibLIBRARIES: $(pkglib_LIBRAR
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
+ 	@list='$(pkglib_LIBRARIES)'; for p in $$list; do \
+-	  if test -f $$p; then \
++	  if false; then \
+ 	    f=$(am__strip_dir) \
  	    echo " $(pkglibLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
--	    $(pkglibLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
- 	  else :; fi; \
+ 	    $(pkglibLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
+@@ -591,7 +591,7 @@ install-pkglibLIBRARIES: $(pkglib_LIBRAR
  	done
  	@$(POST_INSTALL)
-@@ -607,7 +606,6 @@
- 	  if test -f $$p; then \
- 	    p="`echo $$p | sed -e 's|^.*/||'`"; \
- 	    echo " $(RANLIB) '$(DESTDIR)$(pkglibdir)/$$p'"; \
--	    $(RANLIB) "$(DESTDIR)$(pkglibdir)/$$p"; \
- 	  else :; fi; \
- 	done
- 
-@@ -616,7 +614,6 @@
  	@list='$(pkglib_LIBRARIES)'; for p in $$list; do \
- 	  p="`echo $$p | sed -e 's|^.*/||'`"; \
- 	  echo " rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
--	  rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
- 	done
- 
- clean-pkglibLIBRARIES:
+-	  if test -f $$p; then \
++	  if false; then \
+ 	    p=$(am__strip_dir) \
+ 	    echo " $(RANLIB) '$(DESTDIR)$(pkglibdir)/$$p'"; \
+ 	    $(RANLIB) "$(DESTDIR)$(pkglibdir)/$$p"; \
diff --git a/databases/mysql4-server/Makefile b/databases/mysql4-server/Makefile
index 92bb48cfb90..db49327b929 100644
--- a/databases/mysql4-server/Makefile
+++ b/databases/mysql4-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2006/04/23 00:12:36 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2006/05/26 18:25:34 seb Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
-PKGREVISION=		1
 SVR4_PKGNAME=		mysqs
 COMMENT=		MySQL 4, a free SQL database (server)
 
@@ -52,9 +51,6 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysqld_safe ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysql_install_db ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/support-files/mysql.server ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/mysqld.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/man/mysqld_multi.1 ${PREFIX}/man/man1
-	#${INSTALL_MAN} ${WRKSRC}/man/mysqld_safe.1 ${PREFIX}/man/man1
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysql_secure_installation.sh \
 		${PREFIX}/bin/mysql_secure_installation
 
diff --git a/databases/mysql4-server/PLIST b/databases/mysql4-server/PLIST
index 5683a3e2fec..6b9d73c85e8 100644
--- a/databases/mysql4-server/PLIST
+++ b/databases/mysql4-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2005/10/29 14:14:00 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.17 2006/05/26 18:25:34 seb Exp $
 bin/comp_err
 bin/isamchk
 bin/isamlog
@@ -29,8 +29,19 @@ lib/mysql/libmysys.a
 lib/mysql/libnisam.a
 lib/mysql/libvio.a
 libexec/mysqld
+man/man1/isamchk.1
+man/man1/isamlog.1
+man/man1/myisam_ftdump.1
+man/man1/myisamchk.1
+man/man1/myisamlog.1
+man/man1/myisampack.1
+man/man1/mysql.server.1
 man/man1/mysqld.1
 man/man1/mysqld_multi.1
+man/man1/mysqld_safe.1
+man/man1/pack_isam.1
+man/man1/perror.1
+man/man1/replace.1
 share/examples/rc.d/mysqld
 share/mysql-test/README
 share/mysql-test/cacert.pem
@@ -52,11 +63,14 @@ share/mysql-test/include/have_cp932.inc
 share/mysql-test/include/have_crypt.inc
 share/mysql-test/include/have_csv.inc
 share/mysql-test/include/have_debug.inc
+share/mysql-test/include/have_euckr.inc
 share/mysql-test/include/have_exampledb.inc
+share/mysql-test/include/have_gb2312.inc
 share/mysql-test/include/have_gbk.inc
 share/mysql-test/include/have_geometry.inc
 share/mysql-test/include/have_innodb.inc
 share/mysql-test/include/have_isam.inc
+share/mysql-test/include/have_latin2_ch.inc
 share/mysql-test/include/have_lowercase0.inc
 share/mysql-test/include/have_multi_ndb.inc
 share/mysql-test/include/have_ndb.inc
@@ -97,6 +111,7 @@ share/mysql-test/lib/mtr_process.pl
 share/mysql-test/lib/mtr_report.pl
 share/mysql-test/lib/mtr_timer.pl
 share/mysql-test/mysql-test-run
+share/mysql-test/mysql-test-run.pl
 share/mysql-test/r/alias.result
 share/mysql-test/r/alter_table.result
 share/mysql-test/r/analyse.result
@@ -138,11 +153,15 @@ share/mysql-test/r/ctype_collate.result
 share/mysql-test/r/ctype_cp1250_ch.result
 share/mysql-test/r/ctype_cp1251.result
 share/mysql-test/r/ctype_cp932.result
+share/mysql-test/r/ctype_cp932_binlog.result
 share/mysql-test/r/ctype_create.result
+share/mysql-test/r/ctype_euckr.result
+share/mysql-test/r/ctype_gb2312.result
 share/mysql-test/r/ctype_gbk.result
 share/mysql-test/r/ctype_latin1.result
 share/mysql-test/r/ctype_latin1_de.result
 share/mysql-test/r/ctype_latin2.result
+share/mysql-test/r/ctype_latin2_ch.result
 share/mysql-test/r/ctype_many.result
 share/mysql-test/r/ctype_mb.result
 share/mysql-test/r/ctype_recoding.result
@@ -150,6 +169,7 @@ share/mysql-test/r/ctype_sjis.result
 share/mysql-test/r/ctype_tis620.result
 share/mysql-test/r/ctype_uca.result
 share/mysql-test/r/ctype_ucs.result
+share/mysql-test/r/ctype_ucs2_def.result
 share/mysql-test/r/ctype_ucs_binlog.result
 share/mysql-test/r/ctype_ujis.result
 share/mysql-test/r/ctype_utf8.result
@@ -223,11 +243,14 @@ share/mysql-test/r/have_cp932.require
 share/mysql-test/r/have_crypt.require
 share/mysql-test/r/have_csv.require
 share/mysql-test/r/have_debug.require
+share/mysql-test/r/have_euckr.require
 share/mysql-test/r/have_exampledb.require
+share/mysql-test/r/have_gb2312.require
 share/mysql-test/r/have_gbk.require
 share/mysql-test/r/have_geometry.require
 share/mysql-test/r/have_innodb.require
 share/mysql-test/r/have_isam.require
+share/mysql-test/r/have_latin2_ch.require
 share/mysql-test/r/have_met_timezone.require
 share/mysql-test/r/have_moscow_leap_timezone.require
 share/mysql-test/r/have_ndb.require
@@ -254,6 +277,7 @@ share/mysql-test/r/innodb-replace.result
 share/mysql-test/r/innodb.result
 share/mysql-test/r/innodb_cache.result
 share/mysql-test/r/innodb_handler.result
+share/mysql-test/r/innodb_mysql.result
 share/mysql-test/r/insert.result
 share/mysql-test/r/insert_select-binlog.result
 share/mysql-test/r/insert_select.result
@@ -307,6 +331,7 @@ share/mysql-test/r/ndb_index_ordered.result
 share/mysql-test/r/ndb_index_unique.result
 share/mysql-test/r/ndb_insert.result
 share/mysql-test/r/ndb_limit.result
+share/mysql-test/r/ndb_load.result
 share/mysql-test/r/ndb_lock.result
 share/mysql-test/r/ndb_minmax.result
 share/mysql-test/r/ndb_multi.result
@@ -382,6 +407,7 @@ share/mysql-test/r/rpl_do_grant.result
 share/mysql-test/r/rpl_drop.result
 share/mysql-test/r/rpl_drop_db.result
 share/mysql-test/r/rpl_drop_temp.result
+share/mysql-test/r/rpl_dual_pos_advance.result
 share/mysql-test/r/rpl_empty_master_crash.result
 share/mysql-test/r/rpl_error_ignored_table.result
 share/mysql-test/r/rpl_failed_optimize.result
@@ -392,6 +418,7 @@ share/mysql-test/r/rpl_free_items.result
 share/mysql-test/r/rpl_get_lock.result
 share/mysql-test/r/rpl_heap.result
 share/mysql-test/r/rpl_ignore_grant.result
+share/mysql-test/r/rpl_ignore_table.result
 share/mysql-test/r/rpl_init_slave.result
 share/mysql-test/r/rpl_innodb.result
 share/mysql-test/r/rpl_insert_id.result
@@ -413,6 +440,7 @@ share/mysql-test/r/rpl_multi_query.result
 share/mysql-test/r/rpl_multi_update.result
 share/mysql-test/r/rpl_multi_update2.result
 share/mysql-test/r/rpl_multi_update3.result
+share/mysql-test/r/rpl_multi_update4.result
 share/mysql-test/r/rpl_mystery22.result
 share/mysql-test/r/rpl_openssl.result
 share/mysql-test/r/rpl_optimize.result
@@ -434,6 +462,7 @@ share/mysql-test/r/rpl_start_stop_slave.result
 share/mysql-test/r/rpl_temporary.result
 share/mysql-test/r/rpl_timezone.result
 share/mysql-test/r/rpl_trunc_binlog.result
+share/mysql-test/r/rpl_trunc_temp.result
 share/mysql-test/r/rpl_until.result
 share/mysql-test/r/rpl_user_variables.result
 share/mysql-test/r/rpl_variables.result
@@ -481,6 +510,7 @@ share/mysql-test/r/user_var-binlog.result
 share/mysql-test/r/user_var.result
 share/mysql-test/r/varbinary.result
 share/mysql-test/r/variables.result
+share/mysql-test/r/wait_timeout.result
 share/mysql-test/r/warnings.result
 share/mysql-test/r/windows.result
 share/mysql-test/server-cert.pem
@@ -495,6 +525,7 @@ share/mysql-test/std_data/loaddata1.dat
 share/mysql-test/std_data/loaddata2.dat
 share/mysql-test/std_data/loaddata3.dat
 share/mysql-test/std_data/loaddata4.dat
+share/mysql-test/std_data/loaddata5.dat
 share/mysql-test/std_data/loaddata_pair.dat
 share/mysql-test/std_data/master-bin.000001
 share/mysql-test/std_data/rpl_loaddata.dat
@@ -547,12 +578,16 @@ share/mysql-test/t/ctype_collate.test
 share/mysql-test/t/ctype_cp1250_ch.test
 share/mysql-test/t/ctype_cp1251.test
 share/mysql-test/t/ctype_cp932.test
+share/mysql-test/t/ctype_cp932_binlog.test
 share/mysql-test/t/ctype_create.test
+share/mysql-test/t/ctype_euckr.test
+share/mysql-test/t/ctype_gb2312.test
 share/mysql-test/t/ctype_gbk.test
 share/mysql-test/t/ctype_latin1.test
 share/mysql-test/t/ctype_latin1_de-master.opt
 share/mysql-test/t/ctype_latin1_de.test
 share/mysql-test/t/ctype_latin2.test
+share/mysql-test/t/ctype_latin2_ch.test
 share/mysql-test/t/ctype_many.test
 share/mysql-test/t/ctype_mb.test
 share/mysql-test/t/ctype_recoding.test
@@ -560,6 +595,8 @@ share/mysql-test/t/ctype_sjis.test
 share/mysql-test/t/ctype_tis620.test
 share/mysql-test/t/ctype_uca.test
 share/mysql-test/t/ctype_ucs.test
+share/mysql-test/t/ctype_ucs2_def-master.opt
+share/mysql-test/t/ctype_ucs2_def.test
 share/mysql-test/t/ctype_ucs_binlog.test
 share/mysql-test/t/ctype_ujis.test
 share/mysql-test/t/ctype_utf8.test
@@ -644,6 +681,7 @@ share/mysql-test/t/innodb.test
 share/mysql-test/t/innodb_cache-master.opt
 share/mysql-test/t/innodb_cache.test
 share/mysql-test/t/innodb_handler.test
+share/mysql-test/t/innodb_mysql.test
 share/mysql-test/t/insert.test
 share/mysql-test/t/insert_select-binlog.test
 share/mysql-test/t/insert_select.test
@@ -707,6 +745,7 @@ share/mysql-test/t/ndb_index_ordered.test
 share/mysql-test/t/ndb_index_unique.test
 share/mysql-test/t/ndb_insert.test
 share/mysql-test/t/ndb_limit.test
+share/mysql-test/t/ndb_load.test
 share/mysql-test/t/ndb_lock.test
 share/mysql-test/t/ndb_minmax.test
 share/mysql-test/t/ndb_multi.test
@@ -718,6 +757,7 @@ share/mysql-test/t/ndb_truncate.test
 share/mysql-test/t/ndb_types.test
 share/mysql-test/t/ndb_update.test
 share/mysql-test/t/negation_elimination.test
+share/mysql-test/t/not_embedded_server-master.opt
 share/mysql-test/t/not_embedded_server.test
 share/mysql-test/t/null.test
 share/mysql-test/t/null_key.test
@@ -795,6 +835,8 @@ share/mysql-test/t/rpl_drop.test
 share/mysql-test/t/rpl_drop_db.test
 share/mysql-test/t/rpl_drop_temp-slave.opt
 share/mysql-test/t/rpl_drop_temp.test
+share/mysql-test/t/rpl_dual_pos_advance-master.opt
+share/mysql-test/t/rpl_dual_pos_advance.test
 share/mysql-test/t/rpl_empty_master_crash.test
 share/mysql-test/t/rpl_error_ignored_table-slave.opt
 share/mysql-test/t/rpl_error_ignored_table.test
@@ -813,6 +855,8 @@ share/mysql-test/t/rpl_get_lock.test
 share/mysql-test/t/rpl_heap.test
 share/mysql-test/t/rpl_ignore_grant-slave.opt
 share/mysql-test/t/rpl_ignore_grant.test
+share/mysql-test/t/rpl_ignore_table-slave.opt
+share/mysql-test/t/rpl_ignore_table.test
 share/mysql-test/t/rpl_init_slave-slave.opt
 share/mysql-test/t/rpl_init_slave.test
 share/mysql-test/t/rpl_innodb.test
@@ -845,6 +889,8 @@ share/mysql-test/t/rpl_multi_update.test
 share/mysql-test/t/rpl_multi_update2-slave.opt
 share/mysql-test/t/rpl_multi_update2.test
 share/mysql-test/t/rpl_multi_update3.test
+share/mysql-test/t/rpl_multi_update4-slave.opt
+share/mysql-test/t/rpl_multi_update4.test
 share/mysql-test/t/rpl_mystery22.test
 share/mysql-test/t/rpl_openssl.test
 share/mysql-test/t/rpl_optimize.test
@@ -878,6 +924,7 @@ share/mysql-test/t/rpl_timezone-master.opt
 share/mysql-test/t/rpl_timezone-slave.opt
 share/mysql-test/t/rpl_timezone.test
 share/mysql-test/t/rpl_trunc_binlog.test
+share/mysql-test/t/rpl_trunc_temp.test
 share/mysql-test/t/rpl_until.test
 share/mysql-test/t/rpl_user_variables.test
 share/mysql-test/t/rpl_variables.test
@@ -930,6 +977,8 @@ share/mysql-test/t/user_var.test
 share/mysql-test/t/varbinary.test
 share/mysql-test/t/variables-master.opt
 share/mysql-test/t/variables.test
+share/mysql-test/t/wait_timeout-master.opt
+share/mysql-test/t/wait_timeout.test
 share/mysql-test/t/warnings-master.opt
 share/mysql-test/t/warnings.test
 share/mysql-test/t/windows.test
diff --git a/databases/mysql4-server/distinfo b/databases/mysql4-server/distinfo
index c3d2e013210..a57f05e233b 100644
--- a/databases/mysql4-server/distinfo
+++ b/databases/mysql4-server/distinfo
@@ -1,19 +1,18 @@
-$NetBSD: distinfo,v 1.22 2005/10/29 14:14:00 xtraeme Exp $
+$NetBSD: distinfo,v 1.23 2006/05/26 18:25:34 seb Exp $
 
-SHA1 (mysql-4.1.15.tar.gz) = 04e275df6c538117eac9a5ba2ab56e5f01f69286
-RMD160 (mysql-4.1.15.tar.gz) = 07e0c3d5d206f9545cff145cb3ec8db4e395bff0
-Size (mysql-4.1.15.tar.gz) = 17257765 bytes
-SHA1 (patch-aa) = 169ca69b31c92819275b3e7825c60034cb61ddfd
+SHA1 (mysql-4.1.19.tar.gz) = a1ceee918232891e795be3122ad88fed36c700d5
+RMD160 (mysql-4.1.19.tar.gz) = 8da54a0fa1f024237521de644af32821c6376fab
+Size (mysql-4.1.19.tar.gz) = 17349799 bytes
+SHA1 (patch-aa) = f32ae7bbf91ce4edaeccf20789d60ecca82eb062
 SHA1 (patch-ab) = 45f97d4e449c76e46cacba246d5dc9ac8417ec44
-SHA1 (patch-ac) = 4f4bf372ac7ccc2255430a77da47bc5552653d8a
+SHA1 (patch-ac) = fd49d78012d6410263da38fb97a8e0369f98c62d
 SHA1 (patch-ad) = 0959e0ba7316e4fe00b656d7af2d8c2c04ed296f
 SHA1 (patch-ae) = adc6956d4be304db61aa0323061143fffc1b9751
 SHA1 (patch-af) = eb62ce5a52d2311722203c3f2409fe4301e5d724
-SHA1 (patch-ag) = 091b9253fd94aaf79d2287b51142a39b482f7192
 SHA1 (patch-al) = 725a3a6e06d39b26efb706bebbe3ff95da82be96
 SHA1 (patch-am) = 07e4016a0629b7737ad4956962c15e97ddcc6f5d
 SHA1 (patch-aq) = b971690206b416e75046cca3e53f6222b55725c5
-SHA1 (patch-ar) = bb3329100655d99484934e69d5c8a7e3dc459542
+SHA1 (patch-ar) = 93cb95b5e4e290fccbaba8d8bd0b66f115868eed
 SHA1 (patch-as) = 516460b0aa9f641d74f83c5514f258a980033e41
-SHA1 (patch-aw) = 79b9afbcb16a868c193cded23a50e53987579f27
-SHA1 (patch-ax) = b2f76b2d4e6aca649f975eba0f9c18316d4d4c17
+SHA1 (patch-aw) = e89b4ada1a6efa2d8fb2ddaed8eaca6a59603d38
+SHA1 (patch-ax) = c73f0d59c9e079abc8fc16965297257cb8f8a592
diff --git a/databases/mysql4-server/patches/patch-aa b/databases/mysql4-server/patches/patch-aa
index 2176af10c15..06579ef0ba3 100644
--- a/databases/mysql4-server/patches/patch-aa
+++ b/databases/mysql4-server/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.9 2005/07/29 21:02:35 xtraeme Exp $
+$NetBSD: patch-aa,v 1.10 2006/05/26 18:25:34 seb Exp $
 
---- Makefile.in.orig	2005-07-29 22:35:34.000000000 +0200
-+++ Makefile.in	2005-07-29 22:36:03.000000000 +0200
-@@ -344,12 +344,8 @@
+--- Makefile.in.orig	2006-04-29 05:36:56.000000000 +0000
++++ Makefile.in
+@@ -352,12 +352,8 @@ AUTOMAKE_OPTIONS = foreign
+ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
+ 			README COPYING EXCEPTIONS-CLIENT
  
- # 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 \
diff --git a/databases/mysql4-server/patches/patch-ac b/databases/mysql4-server/patches/patch-ac
index 196053b5af5..c764752c5d0 100644
--- a/databases/mysql4-server/patches/patch-ac
+++ b/databases/mysql4-server/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.5 2005/07/29 21:02:35 xtraeme Exp $
+$NetBSD: patch-ac,v 1.6 2006/05/26 18:25:34 seb Exp $
 
---- mysql-test/Makefile.in.orig	2005-07-29 22:39:11.000000000 +0200
-+++ mysql-test/Makefile.in	2005-07-29 22:39:27.000000000 +0200
-@@ -364,7 +364,7 @@
+--- 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@
  @HAVE_NDBCLUSTER_DB_FALSE@USE_NDBCLUSTER = \"\"
  @HAVE_NDBCLUSTER_DB_TRUE@USE_NDBCLUSTER = \"--ndbcluster\"
  benchdir_root = $(prefix)
 -testdir = $(benchdir_root)/mysql-test
 +testdir = $(benchdir_root)/share/mysql-test
- EXTRA_SCRIPTS = mysql-test-run.sh mysql-test-run.pl install_test_db.sh
+ EXTRA_SCRIPTS = mysql-test-run.sh install_test_db.sh $(PRESCRIPTS)
  EXTRA_DIST = $(EXTRA_SCRIPTS) 
- test_SCRIPTS = mysql-test-run install_test_db 
+ GENSCRIPTS = mysql-test-run install_test_db
diff --git a/databases/mysql4-server/patches/patch-ag b/databases/mysql4-server/patches/patch-ag
deleted file mode 100644
index 580c652f6df..00000000000
--- a/databases/mysql4-server/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/10/26 17:33:49 joerg Exp $
-
---- vio/vio.c.orig	2005-10-14 10:23:58.000000000 +0000
-+++ vio/vio.c
-@@ -132,7 +132,7 @@ Vio *vio_new(my_socket sd, enum enum_vio
- 	    vio->sd);
- #if !defined(__WIN__) && !defined(__EMX__) && !defined(OS2)
- #if !defined(NO_FCNTL_NONBLOCK)
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
-     fcntl(sd, F_SETFL, vio->fcntl_mode); /* Yahoo! FreeBSD patch */
- #endif
-     vio->fcntl_mode = fcntl(sd, F_GETFL);
diff --git a/databases/mysql4-server/patches/patch-ar b/databases/mysql4-server/patches/patch-ar
index f86841eb9f3..e9c44db0add 100644
--- a/databases/mysql4-server/patches/patch-ar
+++ b/databases/mysql4-server/patches/patch-ar
@@ -1,21 +1,13 @@
-$NetBSD: patch-ar,v 1.6 2005/01/10 15:47:18 xtraeme Exp $
+$NetBSD: patch-ar,v 1.7 2006/05/26 18:25:34 seb Exp $
 
---- 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 @@
+--- man/Makefile.in.orig	2006-04-29 05:36:31.000000000 +0000
++++ man/Makefile.in
+@@ -325,7 +325,7 @@ uname_prog = @uname_prog@
  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_DIST = mysqld.1.in mysqld_multi.1.in
+-man1_MANS = @man1_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)
+ all: all-am
  
- CLEANFILES = $(man_MANS)
- SUFFIXES = .in
diff --git a/databases/mysql4-server/patches/patch-aw b/databases/mysql4-server/patches/patch-aw
index b08ef246d8c..c32b9e13b5a 100644
--- a/databases/mysql4-server/patches/patch-aw
+++ b/databases/mysql4-server/patches/patch-aw
@@ -1,13 +1,13 @@
-$NetBSD: patch-aw,v 1.2 2005/01/10 15:47:18 xtraeme Exp $
+$NetBSD: patch-aw,v 1.3 2006/05/26 18:25:34 seb Exp $
 
---- 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) \
+--- isam/Makefile.in.orig	2006-04-29 05:36:29.000000000 +0000
++++ isam/Makefile.in
+@@ -119,7 +119,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD
+ LTCOMPILE = $(LIBTOOL) --tag=CC --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) \
+ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  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 bee839f38c3..90cc0ed5506 100644
--- a/databases/mysql4-server/patches/patch-ax
+++ b/databases/mysql4-server/patches/patch-ax
@@ -1,13 +1,13 @@
-$NetBSD: patch-ax,v 1.2 2005/01/10 15:47:18 xtraeme Exp $
+$NetBSD: patch-ax,v 1.3 2006/05/26 18:25:34 seb Exp $
 
---- 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) \
+--- myisam/Makefile.in.orig	2006-04-29 05:36:32.000000000 +0000
++++ myisam/Makefile.in
+@@ -141,7 +141,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD
+ LTCOMPILE = $(LIBTOOL) --tag=CC --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) \
+ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  SOURCES = $(libmyisam_a_SOURCES) mi_test1.c mi_test2.c mi_test3.c \
author	seb <seb@pkgsrc.org>	2006-05-26 18:25:34 +0000
committer	seb <seb@pkgsrc.org>	2006-05-26 18:25:34 +0000
commit	8b4e796d71e99273614fcc4705eab43b63b9436f (patch)
tree	820912031ef3c1b334725d501760554446e6a609 /databases
parent	fd3934e05e7e5a627afe21240bfb731b3bc758fc (diff)
download	pkgsrc-8b4e796d71e99273614fcc4705eab43b63b9436f.tar.gz