pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases Update to 5.0.16.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f46f64140fee
branches:  trunk
changeset: 503942:f46f64140fee
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Fri Dec 02 08:13:26 2005 +0000

description:
Update to 5.0.16.

For information about changes please see:
http://dev.mysql.com/doc/refman/5.0/en/news-5-0-16.html

diffstat:

 databases/mysql5-client/Makefile.common  |  11 ++++-----
 databases/mysql5-client/distinfo         |  13 ++++++-----
 databases/mysql5-client/patches/patch-ae |  12 +++++-----
 databases/mysql5-client/patches/patch-af |  25 +++++++++++------------
 databases/mysql5-client/patches/patch-ak |  13 ++++++++++++
 databases/mysql5-server/Makefile         |   4 +-
 databases/mysql5-server/PLIST            |  28 +++++++++++++++++++++++--
 databases/mysql5-server/distinfo         |  12 +++++-----
 databases/mysql5-server/patches/patch-ag |  30 +++++++++++----------------
 databases/mysql5-server/patches/patch-ah |  34 +++++++++++++++----------------
 10 files changed, 104 insertions(+), 78 deletions(-)

diffs (truncated from 453 to 300 lines):

diff -r 31b48eaab5a5 -r f46f64140fee databases/mysql5-client/Makefile.common
--- a/databases/mysql5-client/Makefile.common   Fri Dec 02 08:11:04 2005 +0000
+++ b/databases/mysql5-client/Makefile.common   Fri Dec 02 08:13:26 2005 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.2 2005/11/09 19:48:44 tv Exp $
+# $NetBSD: Makefile.common,v 1.3 2005/12/02 08:13:26 xtraeme Exp $
 
-DISTNAME=              mysql-5.0.15
+DISTNAME=              mysql-5.0.16
 CATEGORIES=            databases
 MASTER_SITES=          http://mirrors.sunsite.dk/mysql/Downloads/MySQL-5.0/ \
                        ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-5.0/ \
@@ -72,7 +72,7 @@
 .endif
 
 # Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+=                F77=${FALSE}
+CONFIGURE_ENV+=                F77=${FALSE:Q}
 
 CPPFLAGS+=             -Dunix
 CFLAGS+=               -DUSE_OLD_FUNCTIONS # 3.23.x compat
@@ -99,9 +99,8 @@
 
 SUBST_CLASSES+=                mk scripts
 SUBST_STAGE.mk=                post-patch
-SUBST_FILES.mk=                dbug/Makefile.in heap/Makefile.in isam/Makefile.in \
-                       merge/Makefile.in mysys/Makefile.in \
-                       strings/Makefile.in
+SUBST_FILES.mk=                dbug/Makefile.in heap/Makefile.in       \
+                       mysys/Makefile.in strings/Makefile.in
 SUBST_SED.mk=          -e "/^install-exec:/s/install-pkglibLIBRARIES//"
 SUBST_MESSAGE.mk=      "Fixing Makefiles."
 SUBST_STAGE.scripts=   post-patch
diff -r 31b48eaab5a5 -r f46f64140fee databases/mysql5-client/distinfo
--- a/databases/mysql5-client/distinfo  Fri Dec 02 08:11:04 2005 +0000
+++ b/databases/mysql5-client/distinfo  Fri Dec 02 08:13:26 2005 +0000
@@ -1,15 +1,16 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2005/12/02 08:13:26 xtraeme Exp $
 
-SHA1 (mysql-5.0.15.tar.gz) = b6092615de6ef5f861f91810413007c1c63058cf
-RMD160 (mysql-5.0.15.tar.gz) = 6a8007f5d12b945b8c3560d27abe98d41abecaf5
-Size (mysql-5.0.15.tar.gz) = 18813065 bytes
+SHA1 (mysql-5.0.16.tar.gz) = 28f7a20ffefcade3c1cce7250e9d3ea1fa33ab37
+RMD160 (mysql-5.0.16.tar.gz) = ec3108fc8fe043db54329af66a7f99e2da8c716c
+Size (mysql-5.0.16.tar.gz) = 19031670 bytes
 SHA1 (patch-aa) = adc6956d4be304db61aa0323061143fffc1b9751
 SHA1 (patch-ab) = 0959e0ba7316e4fe00b656d7af2d8c2c04ed296f
 SHA1 (patch-ac) = c97ef88d13cba67b79cdb40fc23facf29edbe0b8
 SHA1 (patch-ad) = aab3c8771e398ecab6b7f6c1a85ffaf60f324053
-SHA1 (patch-ae) = 29c830c2eb6cc1ff74cbc4f9d9daa6555734e544
-SHA1 (patch-af) = 6134efe7043eec4cf2acd8eb272108d38bab5be8
+SHA1 (patch-ae) = 1b0b3886e0a4a8e52a3ab5bdf59db281b05caf6a
+SHA1 (patch-af) = bafd3a6bfad180473549278dd5c92a8d7ac889ef
 SHA1 (patch-ag) = 9b1dfa213491d8daf82ff8d5ee293d1279c64ce8
 SHA1 (patch-ah) = bd34391e522ae12ee63ec6a734f7a31116b2918d
 SHA1 (patch-ai) = 242c97ab4658838a6001d9c288e01209abfcee77
 SHA1 (patch-aj) = 31c933a03e2b05aeaff1d89d3fa542aad663e96a
+SHA1 (patch-ak) = a09c2bf961d0e40e328d246e821efc36461dbdf8
diff -r 31b48eaab5a5 -r f46f64140fee databases/mysql5-client/patches/patch-ae
--- a/databases/mysql5-client/patches/patch-ae  Fri Dec 02 08:11:04 2005 +0000
+++ b/databases/mysql5-client/patches/patch-ae  Fri Dec 02 08:13:26 2005 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-ae,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
+$NetBSD: patch-ae,v 1.2 2005/12/02 08:13:26 xtraeme Exp $
 
---- scripts/Makefile.in.orig   2005-10-31 09:12:57.000000000 +0100
-+++ scripts/Makefile.in        2005-10-31 09:13:33.000000000 +0100
-@@ -337,23 +337,10 @@
- yassl_dir = @yassl_dir@
- yassl_integer_extra_cxxflags = @yassl_integer_extra_cxxflags@
+--- scripts/Makefile.in.orig   2005-11-29 20:46:22.000000000 +0100
++++ scripts/Makefile.in        2005-11-29 20:47:23.000000000 +0100
+@@ -341,23 +341,10 @@
+ yassl_libs = @yassl_libs@
+ yassl_libs_with_path = @yassl_libs_with_path@
  zlib_dir = @zlib_dir@
 -bin_SCRIPTS = @server_scripts@ \
 -                      msql2mysql \
diff -r 31b48eaab5a5 -r f46f64140fee databases/mysql5-client/patches/patch-af
--- a/databases/mysql5-client/patches/patch-af  Fri Dec 02 08:11:04 2005 +0000
+++ b/databases/mysql5-client/patches/patch-af  Fri Dec 02 08:13:26 2005 +0000
@@ -1,16 +1,15 @@
-$NetBSD: patch-af,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
+$NetBSD: patch-af,v 1.2 2005/12/02 08:13:26 xtraeme Exp $
 
---- man/Makefile.in.orig       2005-10-31 09:11:58.000000000 +0100
-+++ man/Makefile.in    2005-10-31 09:12:27.000000000 +0100
-@@ -334,9 +334,8 @@
- yassl_dir = @yassl_dir@
- yassl_integer_extra_cxxflags = @yassl_integer_extra_cxxflags@
+--- man/Makefile.in.orig       2005-11-29 20:47:54.000000000 +0100
++++ man/Makefile.in    2005-11-29 20:49:58.000000000 +0100
+@@ -338,7 +338,9 @@
+ yassl_libs = @yassl_libs@
+ yassl_libs_with_path = @yassl_libs_with_path@
  zlib_dir = @zlib_dir@
--man_MANS = mysql.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 = mysql.1 mysql_zap.1 mysqlaccess.1 mysqladmin.1 \
++          mysqldump.1 mysqlshow.1 mysql_fix_privilege_tables.1
++
+ EXTRA_DIST = $(man1_MANS)
+ all: all-am
  
- EXTRA_DIST = mysql.1.in mysql_zap.1.in \
-               mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \
diff -r 31b48eaab5a5 -r f46f64140fee databases/mysql5-client/patches/patch-ak
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql5-client/patches/patch-ak  Fri Dec 02 08:13:26 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2005/12/02 08:13:26 xtraeme Exp $
+
+--- mysys/Makefile.in.orig     2005-12-02 08:52:03.000000000 +0100
++++ mysys/Makefile.in  2005-12-02 08:52:12.000000000 +0100
+@@ -473,7 +473,7 @@
+ INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \
+                       -I$(top_srcdir)/include -I$(srcdir)
+ 
+-pkglib_LIBRARIES = libmysys.a
++pkglib_LIBRARIES =
+ LDADD = libmysys.a ../dbug/libdbug.a \
+                       ../strings/libmystrings.a
+ 
diff -r 31b48eaab5a5 -r f46f64140fee databases/mysql5-server/Makefile
--- a/databases/mysql5-server/Makefile  Fri Dec 02 08:11:04 2005 +0000
+++ b/databases/mysql5-server/Makefile  Fri Dec 02 08:13:26 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/02 08:13:26 xtraeme Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-server-/}
 #PKGREVISION=          1
@@ -7,7 +7,7 @@
 
 CONFLICTS=             {mysql-server-[0-9]*,mysql3-server-[0-9]*}
 
-.include "../mysql5-client/Makefile.common"
+.include "../../databases/mysql5-client/Makefile.common"
 
 CONFIGURE_ARGS+=       --with-libwrap
 CONFIGURE_ARGS+=       --with-raid
diff -r 31b48eaab5a5 -r f46f64140fee databases/mysql5-server/PLIST
--- a/databases/mysql5-server/PLIST     Fri Dec 02 08:11:04 2005 +0000
+++ b/databases/mysql5-server/PLIST     Fri Dec 02 08:13:26 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/12/02 08:13:26 xtraeme Exp $
 bin/comp_err
 bin/innochecksum
 bin/my_print_defaults
@@ -37,6 +37,7 @@
 share/mysql-test/client-key.pem
 share/mysql-test/include/big_test.inc
 share/mysql-test/include/check_var_limit.inc
+share/mysql-test/include/common-tests.inc
 share/mysql-test/include/ctype_common.inc
 share/mysql-test/include/ctype_filesort.inc
 share/mysql-test/include/ctype_innodb_like.inc
@@ -44,6 +45,7 @@
 share/mysql-test/include/endspace.inc
 share/mysql-test/include/federated.inc
 share/mysql-test/include/federated_cleanup.inc
+share/mysql-test/include/gis_generic.inc
 share/mysql-test/include/have_archive.inc
 share/mysql-test/include/have_bdb.inc
 share/mysql-test/include/have_big5.inc
@@ -64,7 +66,6 @@
 share/mysql-test/include/have_multi_ndb.inc
 share/mysql-test/include/have_ndb.inc
 share/mysql-test/include/have_openssl.inc
-share/mysql-test/include/have_openssl_1.inc
 share/mysql-test/include/have_outfile.inc
 share/mysql-test/include/have_query_cache.inc
 share/mysql-test/include/have_sjis.inc
@@ -112,6 +113,7 @@
 share/mysql-test/r/analyze.result
 share/mysql-test/r/ansi.result
 share/mysql-test/r/archive.result
+share/mysql-test/r/archive_gis.result
 share/mysql-test/r/auto_increment.result
 share/mysql-test/r/backup.result
 share/mysql-test/r/bdb-alter-table-1.result
@@ -120,6 +122,7 @@
 share/mysql-test/r/bdb-deadlock.result
 share/mysql-test/r/bdb.result
 share/mysql-test/r/bdb_cache.result
+share/mysql-test/r/bdb_gis.result
 share/mysql-test/r/bench_count_distinct.result
 share/mysql-test/r/big_test.require
 share/mysql-test/r/bigint.result
@@ -135,6 +138,7 @@
 share/mysql-test/r/client_xml.result
 share/mysql-test/r/comments.result
 share/mysql-test/r/compare.result
+share/mysql-test/r/compress.result
 share/mysql-test/r/connect.result
 share/mysql-test/r/consistent_snapshot.result
 share/mysql-test/r/constraints.result
@@ -149,6 +153,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_cp932_binlog.result
 share/mysql-test/r/ctype_create.result
 share/mysql-test/r/ctype_eucjpms.result
 share/mysql-test/r/ctype_gbk.result
@@ -253,7 +258,6 @@
 share/mysql-test/r/have_moscow_leap_timezone.require
 share/mysql-test/r/have_ndb.require
 share/mysql-test/r/have_openssl.require
-share/mysql-test/r/have_openssl_1.require
 share/mysql-test/r/have_outfile.require
 share/mysql-test/r/have_query_cache.require
 share/mysql-test/r/have_raid.require
@@ -289,6 +293,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_gis.result
 share/mysql-test/r/innodb_handler.result
 share/mysql-test/r/insert.result
 share/mysql-test/r/insert_select-binlog.result
@@ -329,6 +334,7 @@
 share/mysql-test/r/mysql_protocols.result
 share/mysql-test/r/mysqlbinlog.result
 share/mysql-test/r/mysqlbinlog2.result
+share/mysql-test/r/mysqlcheck.result
 share/mysql-test/r/mysqldump-max.result
 share/mysql-test/r/mysqldump.result
 share/mysql-test/r/mysqlshow.result
@@ -348,6 +354,7 @@
 share/mysql-test/r/ndb_config.result
 share/mysql-test/r/ndb_database.result
 share/mysql-test/r/ndb_default_cluster.require
+share/mysql-test/r/ndb_gis.result
 share/mysql-test/r/ndb_grant.result
 share/mysql-test/r/ndb_index.result
 share/mysql-test/r/ndb_index_ordered.result
@@ -397,6 +404,7 @@
 share/mysql-test/r/query_cache_notembedded.result
 share/mysql-test/r/raid.result
 share/mysql-test/r/range.result
+share/mysql-test/r/read_only.result
 share/mysql-test/r/rename.result
 share/mysql-test/r/repair.result
 share/mysql-test/r/replace.result
@@ -514,6 +522,8 @@
 share/mysql-test/r/sp.result
 share/mysql-test/r/sp_trans.result
 share/mysql-test/r/sql_mode.result
+share/mysql-test/r/ssl.result
+share/mysql-test/r/ssl_compress.result
 share/mysql-test/r/status.result
 share/mysql-test/r/strict.result
 share/mysql-test/r/subselect.result
@@ -581,6 +591,7 @@
 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_dq.dat
 share/mysql-test/std_data/loaddata_pair.dat
 share/mysql-test/std_data/master-bin.000001
 share/mysql-test/std_data/ndb_config_mycnf1.cnf
@@ -600,6 +611,7 @@
 share/mysql-test/t/analyze.test
 share/mysql-test/t/ansi.test
 share/mysql-test/t/archive.test
+share/mysql-test/t/archive_gis.test
 share/mysql-test/t/auto_increment.test
 share/mysql-test/t/backup-master.sh
 share/mysql-test/t/backup.test
@@ -611,6 +623,7 @@
 share/mysql-test/t/bdb.test
 share/mysql-test/t/bdb_cache-master.opt
 share/mysql-test/t/bdb_cache.test
+share/mysql-test/t/bdb_gis.test
 share/mysql-test/t/bench_count_distinct.test
 share/mysql-test/t/bigint.test
 share/mysql-test/t/binary.test
@@ -625,6 +638,7 @@
 share/mysql-test/t/client_xml.test
 share/mysql-test/t/comments.test
 share/mysql-test/t/compare.test
+share/mysql-test/t/compress.test
 share/mysql-test/t/connect.test
 share/mysql-test/t/consistent_snapshot.test
 share/mysql-test/t/constraints.test
@@ -640,6 +654,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_cp932_binlog.test
 share/mysql-test/t/ctype_create.test
 share/mysql-test/t/ctype_eucjpms.test
 share/mysql-test/t/ctype_gbk.test



Home | Main Index | Thread Index | Old Index