Update mysql4* to 4.1.14:

Lots of changes, please see
http://dev.mysql.com/doc/mysql/en/news-4-1-14.html
for more information.

7 files changed, 37 insertions, 43 deletions

diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
index 9e46f4d4699..346b20040e4 100644
--- a/databases/mysql4-client/Makefile.common
+++ b/databases/mysql4-client/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.43 2005/08/06 18:27:29 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.44 2005/09/26 22:34:49 xtraeme Exp $
 
-DISTNAME=		mysql-4.1.13
+DISTNAME=		mysql-4.1.14
 CATEGORIES=		databases
 MASTER_SITES=		http://mirrors.sunsite.dk/mysql/Downloads/MySQL-4.1/ \
 			ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \
diff --git a/databases/mysql4-client/distinfo b/databases/mysql4-client/distinfo
index b6165e422d1..9b08a5130e5 100644
--- a/databases/mysql4-client/distinfo
+++ b/databases/mysql4-client/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.21 2005/07/29 21:02:35 xtraeme Exp $
+$NetBSD: distinfo,v 1.22 2005/09/26 22:34:49 xtraeme Exp $
 
-SHA1 (mysql-4.1.13.tar.gz) = d9eb27277d2415ed3576fedde2d9ab7cdf6e2dcf
-RMD160 (mysql-4.1.13.tar.gz) = d257ec0f78cdc523a28f15d9a411d56f3bbc1b64
-Size (mysql-4.1.13.tar.gz) = 17137413 bytes
+SHA1 (mysql-4.1.14.tar.gz) = 275e5a304d0f9175734c7ff00eba49f0f856436d
+RMD160 (mysql-4.1.14.tar.gz) = 43a637109ac54f30ddd2c437f81f50776a5d0b2c
+Size (mysql-4.1.14.tar.gz) = 17074439 bytes
 SHA1 (patch-af) = 2d2f8d6eef794e0d296a1b4fdb118323e4e89b6c
 SHA1 (patch-av) = 6cc37eb4265f31ea0fb0bcf4bf05f84f812e96c9
 SHA1 (patch-aw) = cd03eb6c81a932186370e9ed248d0c7886b7286d
-SHA1 (patch-ax) = e1dd563d9e5ea7be207cecd51b157edad35295b5
+SHA1 (patch-ax) = 639f60616609b342a44ebd6ae6269a40c4db0767
 SHA1 (patch-ay) = 9b1dfa213491d8daf82ff8d5ee293d1279c64ce8
 SHA1 (patch-ba) = bd34391e522ae12ee63ec6a734f7a31116b2918d
 SHA1 (patch-bb) = 242c97ab4658838a6001d9c288e01209abfcee77
diff --git a/databases/mysql4-client/patches/patch-ax b/databases/mysql4-client/patches/patch-ax
index fe1c0710b29..7aa5716315b 100644
--- a/databases/mysql4-client/patches/patch-ax
+++ b/databases/mysql4-client/patches/patch-ax
@@ -1,7 +1,7 @@
-$NetBSD: patch-ax,v 1.3 2005/07/29 21:02:35 xtraeme Exp $
+$NetBSD: patch-ax,v 1.4 2005/09/26 22:34:49 xtraeme Exp $
 
---- scripts/Makefile.in.orig	2005-07-29 22:26:17.000000000 +0200
-+++ scripts/Makefile.in	2005-07-29 22:27:18.000000000 +0200
+--- 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 @@
  vio_dir = @vio_dir@
  vio_libs = @vio_libs@
@@ -29,4 +29,4 @@ $NetBSD: patch-ax,v 1.3 2005/07/29 21:02:35 xtraeme Exp $
 +	mysqldumpslow mysql_explain_log mysql_tableinfo \
  			mysql_create_system_tables
  
- EXTRA_SCRIPTS = make_binary_distribution.sh \
+ noinst_SCRIPTS = make_binary_distribution \
diff --git a/databases/mysql4-server/PLIST b/databases/mysql4-server/PLIST
index b2aab72b82f..a92ebd4e826 100644
--- a/databases/mysql4-server/PLIST
+++ b/databases/mysql4-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2005/07/29 21:02:35 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.15 2005/09/26 22:34:49 xtraeme Exp $
 bin/comp_err
 bin/isamchk
 bin/isamlog
@@ -39,6 +39,7 @@ share/mysql-test/client-key.pem
 share/mysql-test/include/check_var_limit.inc
 share/mysql-test/include/ctype_common.inc
 share/mysql-test/include/ctype_filesort.inc
+share/mysql-test/include/ctype_innodb_like.inc
 share/mysql-test/include/endspace.inc
 share/mysql-test/include/have_archive.inc
 share/mysql-test/include/have_bdb.inc
@@ -51,6 +52,7 @@ 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_exampledb.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
@@ -67,6 +69,7 @@ share/mysql-test/include/have_ujis.inc
 share/mysql-test/include/master-slave.inc
 share/mysql-test/include/not_embedded.inc
 share/mysql-test/include/not_openssl.inc
+share/mysql-test/include/not_windows.inc
 share/mysql-test/include/ps_conv.inc
 share/mysql-test/include/ps_create.inc
 share/mysql-test/include/ps_modify.inc
@@ -130,6 +133,7 @@ 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_create.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
@@ -214,6 +218,7 @@ 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_exampledb.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
@@ -288,6 +293,7 @@ share/mysql-test/r/ndb_basic.result
 share/mysql-test/r/ndb_blob.result
 share/mysql-test/r/ndb_cache.result
 share/mysql-test/r/ndb_charset.result
+share/mysql-test/r/ndb_config.result
 share/mysql-test/r/ndb_database.result
 share/mysql-test/r/ndb_grant.result
 share/mysql-test/r/ndb_index.result
@@ -307,6 +313,7 @@ share/mysql-test/r/ndb_types.result
 share/mysql-test/r/ndb_update.result
 share/mysql-test/r/negation_elimination.result
 share/mysql-test/r/not_embedded.require
+share/mysql-test/r/not_embedded_server.result
 share/mysql-test/r/not_openssl.require
 share/mysql-test/r/null.result
 share/mysql-test/r/null_key.result
@@ -333,6 +340,7 @@ share/mysql-test/r/ps_7ndb.result
 share/mysql-test/r/ps_grant.result
 share/mysql-test/r/query_cache.result
 share/mysql-test/r/query_cache_merge.result
+share/mysql-test/r/query_cache_notembedded.result
 share/mysql-test/r/raid.result
 share/mysql-test/r/range.result
 share/mysql-test/r/rename.result
@@ -412,6 +420,7 @@ share/mysql-test/r/rpl_server_id1.result
 share/mysql-test/r/rpl_server_id2.result
 share/mysql-test/r/rpl_set_charset.result
 share/mysql-test/r/rpl_skip_error.result
+share/mysql-test/r/rpl_slave_status.result
 share/mysql-test/r/rpl_sporadic_master.result
 share/mysql-test/r/rpl_start_stop_slave.result
 share/mysql-test/r/rpl_temporary.result
@@ -530,6 +539,7 @@ 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_create.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
@@ -680,6 +690,7 @@ share/mysql-test/t/ndb_basic.test
 share/mysql-test/t/ndb_blob.test
 share/mysql-test/t/ndb_cache.test
 share/mysql-test/t/ndb_charset.test
+share/mysql-test/t/ndb_config.test
 share/mysql-test/t/ndb_database.test
 share/mysql-test/t/ndb_index.test
 share/mysql-test/t/ndb_index_ordered.test
@@ -697,6 +708,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.test
 share/mysql-test/t/null.test
 share/mysql-test/t/null_key.test
 share/mysql-test/t/odbc.test
@@ -722,6 +734,7 @@ share/mysql-test/t/ps_7ndb.test
 share/mysql-test/t/ps_grant.test
 share/mysql-test/t/query_cache.test
 share/mysql-test/t/query_cache_merge.test
+share/mysql-test/t/query_cache_notembedded.test
 share/mysql-test/t/raid.test
 share/mysql-test/t/range.test
 share/mysql-test/t/rename.test
@@ -844,6 +857,7 @@ share/mysql-test/t/rpl_server_id2.test
 share/mysql-test/t/rpl_set_charset.test
 share/mysql-test/t/rpl_skip_error-slave.opt
 share/mysql-test/t/rpl_skip_error.test
+share/mysql-test/t/rpl_slave_status.test
 share/mysql-test/t/rpl_sporadic_master-master.opt
 share/mysql-test/t/rpl_sporadic_master.test
 share/mysql-test/t/rpl_start_stop_slave.test
diff --git a/databases/mysql4-server/distinfo b/databases/mysql4-server/distinfo
index df9b8b13627..760a7ba3b6c 100644
--- a/databases/mysql4-server/distinfo
+++ b/databases/mysql4-server/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2005/07/29 21:02:35 xtraeme Exp $
+$NetBSD: distinfo,v 1.20 2005/09/26 22:34:51 xtraeme Exp $
 
-SHA1 (mysql-4.1.13.tar.gz) = d9eb27277d2415ed3576fedde2d9ab7cdf6e2dcf
-RMD160 (mysql-4.1.13.tar.gz) = d257ec0f78cdc523a28f15d9a411d56f3bbc1b64
-Size (mysql-4.1.13.tar.gz) = 17137413 bytes
+SHA1 (mysql-4.1.14.tar.gz) = 275e5a304d0f9175734c7ff00eba49f0f856436d
+RMD160 (mysql-4.1.14.tar.gz) = 43a637109ac54f30ddd2c437f81f50776a5d0b2c
+Size (mysql-4.1.14.tar.gz) = 17074439 bytes
 SHA1 (patch-aa) = 169ca69b31c92819275b3e7825c60034cb61ddfd
 SHA1 (patch-ab) = 45f97d4e449c76e46cacba246d5dc9ac8417ec44
 SHA1 (patch-ac) = 4f4bf372ac7ccc2255430a77da47bc5552653d8a
@@ -11,7 +11,6 @@ SHA1 (patch-al) = 725a3a6e06d39b26efb706bebbe3ff95da82be96
 SHA1 (patch-am) = 07e4016a0629b7737ad4956962c15e97ddcc6f5d
 SHA1 (patch-aq) = b971690206b416e75046cca3e53f6222b55725c5
 SHA1 (patch-ar) = bb3329100655d99484934e69d5c8a7e3dc459542
-SHA1 (patch-as) = a31086086d934e2289b90365c2fd79f1ee059d53
-SHA1 (patch-at) = b8a4ad4d4ff8cf04b300c147a68847d1476e607e
+SHA1 (patch-as) = 516460b0aa9f641d74f83c5514f258a980033e41
 SHA1 (patch-aw) = 79b9afbcb16a868c193cded23a50e53987579f27
 SHA1 (patch-ax) = b2f76b2d4e6aca649f975eba0f9c18316d4d4c17
diff --git a/databases/mysql4-server/patches/patch-as b/databases/mysql4-server/patches/patch-as
index 2e88825219f..49bdd276fdd 100644
--- a/databases/mysql4-server/patches/patch-as
+++ b/databases/mysql4-server/patches/patch-as
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.7 2005/02/16 02:21:37 xtraeme Exp $
+$NetBSD: patch-as,v 1.8 2005/09/26 22:34:51 xtraeme Exp $
 
---- support-files/Makefile.in.orig	2005-02-16 03:49:38.000000000 +0100
-+++ support-files/Makefile.in	2005-02-16 03:50:06.000000000 +0100
-@@ -343,15 +343,7 @@
+--- 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 @@
  			ndb-config-2-node.ini.sh
  
  SUBDIRS = MacOSX
@@ -12,10 +12,9 @@ $NetBSD: patch-as,v 1.7 2005/02/16 02:21:37 xtraeme Exp $
 -			my-huge.cnf \
 -      my-innodb-heavy-4G.cnf \
 -			mysql-log-rotate \
--			mysql-@VERSION@.spec \
--			MySQL-shared-compat.spec \
+-			binary-configure \
 -			ndb-config-2-node.ini
 +pkgdata_DATA =
  
  pkgdata_SCRIPTS = mysql.server
- CLEANFILES = my-small.cnf \
+ noinst_DATA = mysql-@VERSION@.spec \
diff --git a/databases/mysql4-server/patches/patch-at b/databases/mysql4-server/patches/patch-at
deleted file mode 100644
index b6975fe6615..00000000000
--- a/databases/mysql4-server/patches/patch-at
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-at,v 1.3 2005/01/10 15:47:18 xtraeme Exp $
-
---- 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 = 
- CLEANFILES = Info.plist \
- 		Description.plist \
- 		StartupParameters.plist \