Update mysql4* to 4.1.5.

Please see http://dev.mysql.com/doc/refman/4.1/en/news-4-1-15.html
for more information about bugfixes/changes.

5 files changed, 26 insertions, 13 deletions

diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
index 346b20040e4..c9e6002ab60 100644
--- a/databases/mysql4-client/Makefile.common
+++ b/databases/mysql4-client/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.44 2005/09/26 22:34:49 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.45 2005/10/29 14:14:00 xtraeme Exp $
 
-DISTNAME=		mysql-4.1.14
+DISTNAME=		mysql-4.1.15
 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 4e44f9cf87e..bce4074ac3a 100644
--- a/databases/mysql4-client/distinfo
+++ b/databases/mysql4-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.23 2005/10/26 17:33:07 joerg Exp $
+$NetBSD: distinfo,v 1.24 2005/10/29 14:14:00 xtraeme Exp $
 
-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 (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) = adc6956d4be304db61aa0323061143fffc1b9751
 SHA1 (patch-ab) = 0959e0ba7316e4fe00b656d7af2d8c2c04ed296f
 SHA1 (patch-ac) = 091b9253fd94aaf79d2287b51142a39b482f7192
diff --git a/databases/mysql4-server/Makefile b/databases/mysql4-server/Makefile
index f7c66217a6f..1c1e72620a4 100644
--- a/databases/mysql4-server/Makefile
+++ b/databases/mysql4-server/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2005/10/03 14:24:30 xtraeme Exp $
+# $NetBSD: Makefile,v 1.23 2005/10/29 14:14:00 xtraeme Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
-PKGREVISION=		1
+#PKGREVISION=		1
 SVR4_PKGNAME=		mysqs
 COMMENT=		MySQL 4, a free SQL database (server)
 
diff --git a/databases/mysql4-server/PLIST b/databases/mysql4-server/PLIST
index a92ebd4e826..5683a3e2fec 100644
--- a/databases/mysql4-server/PLIST
+++ b/databases/mysql4-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2005/09/26 22:34:49 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.16 2005/10/29 14:14:00 xtraeme Exp $
 bin/comp_err
 bin/isamchk
 bin/isamlog
@@ -40,6 +40,7 @@ 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/ctype_like_escape.inc
 share/mysql-test/include/endspace.inc
 share/mysql-test/include/have_archive.inc
 share/mysql-test/include/have_bdb.inc
@@ -56,6 +57,7 @@ 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_lowercase0.inc
 share/mysql-test/include/have_multi_ndb.inc
 share/mysql-test/include/have_ndb.inc
 share/mysql-test/include/have_openssl.inc
@@ -67,6 +69,8 @@ share/mysql-test/include/have_tis620.inc
 share/mysql-test/include/have_ucs2.inc
 share/mysql-test/include/have_ujis.inc
 share/mysql-test/include/master-slave.inc
+share/mysql-test/include/mysqltest-x.inc
+share/mysql-test/include/mysqltest_while.inc
 share/mysql-test/include/not_embedded.inc
 share/mysql-test/include/not_openssl.inc
 share/mysql-test/include/not_windows.inc
@@ -79,6 +83,7 @@ share/mysql-test/include/ps_renew.inc
 share/mysql-test/include/rpl_stmt_seq.inc
 share/mysql-test/include/system_db_struct.inc
 share/mysql-test/include/test_outfile.inc
+share/mysql-test/include/windows.inc
 share/mysql-test/install_test_db
 share/mysql-test/lib/init_db.sql
 share/mysql-test/lib/mtr_cases.pl
@@ -90,6 +95,7 @@ share/mysql-test/lib/mtr_match.pl
 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/mysql-test-run
 share/mysql-test/r/alias.result
 share/mysql-test/r/alter_table.result
@@ -374,6 +380,7 @@ share/mysql-test/r/rpl_deadlock.result
 share/mysql-test/r/rpl_delete_all.result
 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_empty_master_crash.result
 share/mysql-test/r/rpl_error_ignored_table.result
@@ -389,6 +396,7 @@ share/mysql-test/r/rpl_init_slave.result
 share/mysql-test/r/rpl_innodb.result
 share/mysql-test/r/rpl_insert_id.result
 share/mysql-test/r/rpl_insert_ignore.result
+share/mysql-test/r/rpl_insert_select.result
 share/mysql-test/r/rpl_loaddata.result
 share/mysql-test/r/rpl_loaddata_rule_m.result
 share/mysql-test/r/rpl_loaddata_rule_s.result
@@ -474,6 +482,7 @@ share/mysql-test/r/user_var.result
 share/mysql-test/r/varbinary.result
 share/mysql-test/r/variables.result
 share/mysql-test/r/warnings.result
+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
@@ -560,6 +569,7 @@ share/mysql-test/t/delayed.test
 share/mysql-test/t/delete.test
 share/mysql-test/t/derived.test
 share/mysql-test/t/dirty_close.test
+share/mysql-test/t/disabled.def
 share/mysql-test/t/distinct.test
 share/mysql-test/t/drop.test
 share/mysql-test/t/drop_temp_table.test
@@ -782,6 +792,7 @@ share/mysql-test/t/rpl_deadlock.test
 share/mysql-test/t/rpl_delete_all.test
 share/mysql-test/t/rpl_do_grant.test
 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_empty_master_crash.test
@@ -809,6 +820,7 @@ share/mysql-test/t/rpl_insert_id-slave.opt
 share/mysql-test/t/rpl_insert_id.test
 share/mysql-test/t/rpl_insert_ignore-slave.opt
 share/mysql-test/t/rpl_insert_ignore.test
+share/mysql-test/t/rpl_insert_select.test
 share/mysql-test/t/rpl_loaddata.test
 share/mysql-test/t/rpl_loaddata_rule_m-master.opt
 share/mysql-test/t/rpl_loaddata_rule_m.test
@@ -920,6 +932,7 @@ share/mysql-test/t/variables-master.opt
 share/mysql-test/t/variables.test
 share/mysql-test/t/warnings-master.opt
 share/mysql-test/t/warnings.test
+share/mysql-test/t/windows.test
 share/mysql/charsets/Index.xml
 share/mysql/charsets/README
 share/mysql/charsets/armscii8.xml
diff --git a/databases/mysql4-server/distinfo b/databases/mysql4-server/distinfo
index ba02f37c7c5..c3d2e013210 100644
--- a/databases/mysql4-server/distinfo
+++ b/databases/mysql4-server/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.21 2005/10/26 17:33:07 joerg Exp $
+$NetBSD: distinfo,v 1.22 2005/10/29 14:14:00 xtraeme Exp $
 
-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 (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 (patch-ab) = 45f97d4e449c76e46cacba246d5dc9ac8417ec44
 SHA1 (patch-ac) = 4f4bf372ac7ccc2255430a77da47bc5552653d8a