[pkgsrc/trunk]: pkgsrc/databases Update mysql4-* to 4.1.12.

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6a24414f99fa
branches:  trunk
changeset: 494380:6a24414f99fa
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Mon May 23 14:00:20 2005 +0000

description:
Update mysql4-* to 4.1.12.

Lots of changes and bugs fixed, see
http://dev.mysql.com/doc/mysql/en/news-4-1-12.html
for more information.

diffstat:

 databases/mysql4-client/MESSAGE          |   4 +-
 databases/mysql4-client/Makefile.common  |   5 ++-
 databases/mysql4-client/buildlink3.mk    |   4 +-
 databases/mysql4-client/distinfo         |  10 +++---
 databases/mysql4-client/patches/patch-af |  19 +++++++++---
 databases/mysql4-server/PLIST            |  48 +++++++++++++++++++++++--------
 databases/mysql4-server/distinfo         |  12 ++++----
 databases/mysql4-server/patches/patch-ac |   8 ++--
 databases/mysql4-server/patches/patch-af |  17 ++++++++--
 9 files changed, 84 insertions(+), 43 deletions(-)

diffs (truncated from 442 to 300 lines):

diff -r 1353a23f3892 -r 6a24414f99fa databases/mysql4-client/MESSAGE
--- a/databases/mysql4-client/MESSAGE   Mon May 23 13:18:13 2005 +0000
+++ b/databases/mysql4-client/MESSAGE   Mon May 23 14:00:20 2005 +0000
@@ -1,10 +1,10 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2004/12/02 00:42:06 xtraeme Exp $
+$NetBSD: MESSAGE,v 1.2 2005/05/23 14:00:20 xtraeme Exp $
 
 To use the ``mysqlhotcopy'' script, you'll have to install the following
 packages:
 
+       databases/p5-DBD-mysql
        devel/p5-File-Temp
-       databases/p5-DBD-mysql
 
 ===========================================================================
diff -r 1353a23f3892 -r 6a24414f99fa databases/mysql4-client/Makefile.common
--- a/databases/mysql4-client/Makefile.common   Mon May 23 13:18:13 2005 +0000
+++ b/databases/mysql4-client/Makefile.common   Mon May 23 14:00:20 2005 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.39 2005/05/22 20:07:46 jlam Exp $
+# $NetBSD: Makefile.common,v 1.40 2005/05/23 14:00:20 xtraeme Exp $
 
-DISTNAME=              mysql-4.1.11
+DISTNAME=              mysql-4.1.12
 CATEGORIES=            databases
 MASTER_SITES=          http://mirrors.sunsite.dk/mysql/Downloads/MySQL-4.1/ \
                        ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \
@@ -43,6 +43,7 @@
 
 # We always use our own readline, either system- or pkgsrc-supplied.
 CONFIGURE_ARGS+=       --without-readline
+CONFIGURE_ARGS+=       --without-libedit
 
 # This forces mysql.info _not_ to be rebuilt.
 CONFIGURE_ARGS+=       --without-docs
diff -r 1353a23f3892 -r 6a24414f99fa databases/mysql4-client/buildlink3.mk
--- a/databases/mysql4-client/buildlink3.mk     Mon May 23 13:18:13 2005 +0000
+++ b/databases/mysql4-client/buildlink3.mk     Mon May 23 14:00:20 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2005/03/15 15:09:14 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2005/05/23 14:00:20 xtraeme Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 MYSQL_CLIENT_BUILDLINK3_MK:=   ${MYSQL_CLIENT_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@
 
 .if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.mysql-client+=       mysql-client>=4.1.7
-BUILDLINK_RECOMMENDED.mysql-client+=   mysql-client>=4.1.10a
+BUILDLINK_RECOMMENDED.mysql-client+=   mysql-client>=4.1.12
 BUILDLINK_PKGSRCDIR.mysql-client?=     ../../databases/mysql4-client
 BUILDLINK_LIBDIRS.mysql-client?=       lib/mysql
 .endif # MYSQL_CLIENT_BUILDLINK3_MK
diff -r 1353a23f3892 -r 6a24414f99fa databases/mysql4-client/distinfo
--- a/databases/mysql4-client/distinfo  Mon May 23 13:18:13 2005 +0000
+++ b/databases/mysql4-client/distinfo  Mon May 23 14:00:20 2005 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.19 2005/04/06 14:13:45 xtraeme Exp $
+$NetBSD: distinfo,v 1.20 2005/05/23 14:00:20 xtraeme Exp $
 
-SHA1 (mysql-4.1.11.tar.gz) = 3fa4a9afbf56ca39bf4a2e393bc7b7f6b3cbee05
-RMD160 (mysql-4.1.11.tar.gz) = 1e61c58e5a23a39d71a3c8cdc535061560e5485f
-Size (mysql-4.1.11.tar.gz) = 22880239 bytes
-SHA1 (patch-af) = 40c6d8a8a51bad8f0132bf63dbf865e4a5362504
+SHA1 (mysql-4.1.12.tar.gz) = 2cea7ff988d9b19e8adfb5234164d671f21b0ed9
+RMD160 (mysql-4.1.12.tar.gz) = f0990c34dd7b15aa137cb002c56bf036be00e8ad
+Size (mysql-4.1.12.tar.gz) = 17069350 bytes
+SHA1 (patch-af) = 2d2f8d6eef794e0d296a1b4fdb118323e4e89b6c
 SHA1 (patch-au) = 9183bfa3a6f5b4a9553a6de83448fb684d514a91
 SHA1 (patch-av) = 4f73104cd3b798103eb2c4f83073dbac02b4db90
 SHA1 (patch-aw) = cd03eb6c81a932186370e9ed248d0c7886b7286d
diff -r 1353a23f3892 -r 6a24414f99fa databases/mysql4-client/patches/patch-af
--- a/databases/mysql4-client/patches/patch-af  Mon May 23 13:18:13 2005 +0000
+++ b/databases/mysql4-client/patches/patch-af  Mon May 23 14:00:20 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.6 2005/01/17 14:42:35 xtraeme Exp $
+$NetBSD: patch-af,v 1.7 2005/05/23 14:00:21 xtraeme Exp $
 
---- configure.orig     2005-01-17 15:03:22.000000000 +0100
-+++ configure  2005-01-17 15:05:30.000000000 +0100
-@@ -36436,30 +36436,10 @@
+--- configure.orig     2005-05-13 13:34:04.000000000 +0200
++++ configure  2005-05-23 12:36:42.000000000 +0200
+@@ -37003,30 +37003,10 @@
  fi;
  
  
@@ -33,7 +33,7 @@
  
  
  
-@@ -36738,7 +36718,7 @@
+@@ -37304,7 +37284,7 @@
  else
    bench_dirs=""
  fi
@@ -42,3 +42,12 @@
  
  
  # Don't build readline, i have it already
+@@ -37421,7 +37401,7 @@
+ main ()
+ {
+ 
+-              char res= *(*rl_completion_entry_function)(0,0);
++              char res=(*rl_completion_entry_function)(0,0);
+               completion_matches(0,0);
+ 
+   ;
diff -r 1353a23f3892 -r 6a24414f99fa databases/mysql4-server/PLIST
--- a/databases/mysql4-server/PLIST     Mon May 23 13:18:13 2005 +0000
+++ b/databases/mysql4-server/PLIST     Mon May 23 14:00:20 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2005/05/02 20:33:58 reed Exp $
+@comment $NetBSD: PLIST,v 1.12 2005/05/23 14:00:21 xtraeme Exp $
 bin/comp_err
 bin/isamchk
 bin/isamlog
@@ -31,7 +31,6 @@
 libexec/mysqld
 man/man1/mysqld.1
 man/man1/mysqld_multi.1
-share/examples/rc.d/mysqld
 share/mysql-test/README
 share/mysql-test/cacert.pem
 share/mysql-test/client-cert.pem
@@ -46,6 +45,7 @@
 share/mysql-test/include/have_blackhole.inc
 share/mysql-test/include/have_compress.inc
 share/mysql-test/include/have_cp1250_ch.inc
+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
@@ -72,10 +72,19 @@
 share/mysql-test/include/ps_renew.inc
 share/mysql-test/include/system_db_struct.inc
 share/mysql-test/install_test_db
+share/mysql-test/lib/init_db.sql
+share/mysql-test/lib/mtr_cases.pl
+share/mysql-test/lib/mtr_diff.pl
+share/mysql-test/lib/mtr_gcov.pl
+share/mysql-test/lib/mtr_gprof.pl
+share/mysql-test/lib/mtr_io.pl
+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/mysql-test-run
 share/mysql-test/r/alias.result
 share/mysql-test/r/alter_table.result
-share/mysql-test/r/alter_table.result.es
 share/mysql-test/r/analyse.result
 share/mysql-test/r/ansi.result
 share/mysql-test/r/archive.result
@@ -113,9 +122,11 @@
 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_create.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_many.result
 share/mysql-test/r/ctype_mb.result
 share/mysql-test/r/ctype_recoding.result
@@ -123,6 +134,7 @@
 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_ucs_binlog.result
 share/mysql-test/r/ctype_ujis.result
 share/mysql-test/r/ctype_utf8.result
 share/mysql-test/r/date_formats.result
@@ -133,7 +145,6 @@
 share/mysql-test/r/distinct.result
 share/mysql-test/r/drop.result
 share/mysql-test/r/drop_temp_table.result
-share/mysql-test/r/drop_temp_table.result.es
 share/mysql-test/r/empty_table.result
 share/mysql-test/r/endspace.result
 share/mysql-test/r/errors.result
@@ -190,6 +201,7 @@
 share/mysql-test/r/have_blackhole.require
 share/mysql-test/r/have_compress.require
 share/mysql-test/r/have_cp1250_ch.require
+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
@@ -218,13 +230,13 @@
 share/mysql-test/r/init_connect.result
 share/mysql-test/r/innodb-deadlock.result
 share/mysql-test/r/innodb-lock.result
+share/mysql-test/r/innodb-replace.result
 share/mysql-test/r/innodb.result
-share/mysql-test/r/innodb.result.es
 share/mysql-test/r/innodb_cache.result
 share/mysql-test/r/innodb_handler.result
 share/mysql-test/r/insert.result
+share/mysql-test/r/insert_select-binlog.result
 share/mysql-test/r/insert_select.result
-share/mysql-test/r/insert_select.result.es
 share/mysql-test/r/insert_update.result
 share/mysql-test/r/isam.result
 share/mysql-test/r/join.result
@@ -254,7 +266,6 @@
 share/mysql-test/r/multi_statement.result
 share/mysql-test/r/multi_update.result
 share/mysql-test/r/myisam-blob.result
-share/mysql-test/r/myisam-blob.result.es
 share/mysql-test/r/myisam.result
 share/mysql-test/r/mysql_protocols.result
 share/mysql-test/r/mysqlbinlog.result
@@ -268,6 +279,7 @@
 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_database.result
 share/mysql-test/r/ndb_grant.result
 share/mysql-test/r/ndb_index.result
 share/mysql-test/r/ndb_index_ordered.result
@@ -297,7 +309,6 @@
 share/mysql-test/r/outfile.result
 share/mysql-test/r/overflow.result
 share/mysql-test/r/packet.result
-share/mysql-test/r/packet.result.es
 share/mysql-test/r/preload.result
 share/mysql-test/r/ps.result
 share/mysql-test/r/ps_10nestset.result
@@ -309,8 +320,8 @@
 share/mysql-test/r/ps_5merge.result
 share/mysql-test/r/ps_6bdb.result
 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.result.es
 share/mysql-test/r/query_cache_merge.result
 share/mysql-test/r/raid.result
 share/mysql-test/r/range.result
@@ -395,8 +406,8 @@
 share/mysql-test/r/rpl_trunc_binlog.result
 share/mysql-test/r/rpl_until.result
 share/mysql-test/r/rpl_user_variables.result
+share/mysql-test/r/rpl_variables.result
 share/mysql-test/r/select.result
-share/mysql-test/r/select.result.es
 share/mysql-test/r/select_found.result
 share/mysql-test/r/select_safe.result
 share/mysql-test/r/show_check.result
@@ -418,19 +429,17 @@
 share/mysql-test/r/timezone.result
 share/mysql-test/r/timezone2.result
 share/mysql-test/r/timezone3.result
+share/mysql-test/r/timezone_grant.result
 share/mysql-test/r/true.require
 share/mysql-test/r/truncate.result
 share/mysql-test/r/type_blob.result
-share/mysql-test/r/type_blob.result.es
 share/mysql-test/r/type_date.result
 share/mysql-test/r/type_datetime.result
 share/mysql-test/r/type_decimal.result
 share/mysql-test/r/type_enum.result
 share/mysql-test/r/type_float.result
-share/mysql-test/r/type_float.result.es
 share/mysql-test/r/type_nchar.result
 share/mysql-test/r/type_ranges.result
-share/mysql-test/r/type_ranges.result.es
 share/mysql-test/r/type_set.result
 share/mysql-test/r/type_time.result
 share/mysql-test/r/type_timestamp.result
@@ -438,6 +447,7 @@
 share/mysql-test/r/type_year.result
 share/mysql-test/r/union.result
 share/mysql-test/r/update.result
+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
@@ -499,10 +509,12 @@
 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_create.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_many.test
 share/mysql-test/t/ctype_mb.test
 share/mysql-test/t/ctype_recoding.test
@@ -510,6 +522,7 @@
 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_ucs_binlog.test
 share/mysql-test/t/ctype_ujis.test