pkgsrc-Changes-HG archive

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

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



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b4d97f9009d9
branches:  trunk
changeset: 497523:b4d97f9009d9
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Fri Jul 29 21:02:35 2005 +0000

description:
Update to 4.1.13.

Lots of changes, see http://dev.mysql.com/doc/mysql/en/news-4-1-13.html
for a detailed description.

diffstat:

 databases/mysql4-client/Makefile.common  |   4 ++--
 databases/mysql4-client/distinfo         |  13 ++++++-------
 databases/mysql4-client/patches/patch-au |  13 -------------
 databases/mysql4-client/patches/patch-av |  10 +++++-----
 databases/mysql4-client/patches/patch-ax |  16 +++++++---------
 databases/mysql4-server/Makefile         |   4 ++--
 databases/mysql4-server/PLIST            |  26 ++++++++++++++++++++++++--
 databases/mysql4-server/distinfo         |  15 +++++++--------
 databases/mysql4-server/patches/patch-aa |  12 ++++++------
 databases/mysql4-server/patches/patch-ab |  14 +++++++-------
 databases/mysql4-server/patches/patch-ac |   8 ++++----
 databases/mysql4-server/patches/patch-au |  13 -------------
 12 files changed, 70 insertions(+), 78 deletions(-)

diffs (truncated from 405 to 300 lines):

diff -r 6d5b784b7dae -r b4d97f9009d9 databases/mysql4-client/Makefile.common
--- a/databases/mysql4-client/Makefile.common   Fri Jul 29 19:34:48 2005 +0000
+++ b/databases/mysql4-client/Makefile.common   Fri Jul 29 21:02:35 2005 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.41 2005/07/16 01:19:08 jlam Exp $
+# $NetBSD: Makefile.common,v 1.42 2005/07/29 21:02:35 xtraeme Exp $
 
-DISTNAME=              mysql-4.1.12
+DISTNAME=              mysql-4.1.13
 CATEGORIES=            databases
 MASTER_SITES=          http://mirrors.sunsite.dk/mysql/Downloads/MySQL-4.1/ \
                        ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \
diff -r 6d5b784b7dae -r b4d97f9009d9 databases/mysql4-client/distinfo
--- a/databases/mysql4-client/distinfo  Fri Jul 29 19:34:48 2005 +0000
+++ b/databases/mysql4-client/distinfo  Fri Jul 29 21:02:35 2005 +0000
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.20 2005/05/23 14:00:20 xtraeme Exp $
+$NetBSD: distinfo,v 1.21 2005/07/29 21:02:35 xtraeme Exp $
 
-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 (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 (patch-af) = 2d2f8d6eef794e0d296a1b4fdb118323e4e89b6c
-SHA1 (patch-au) = 9183bfa3a6f5b4a9553a6de83448fb684d514a91
-SHA1 (patch-av) = 4f73104cd3b798103eb2c4f83073dbac02b4db90
+SHA1 (patch-av) = 6cc37eb4265f31ea0fb0bcf4bf05f84f812e96c9
 SHA1 (patch-aw) = cd03eb6c81a932186370e9ed248d0c7886b7286d
-SHA1 (patch-ax) = 9e9176468d6d335617862a4d77a358931d7c8c49
+SHA1 (patch-ax) = e1dd563d9e5ea7be207cecd51b157edad35295b5
 SHA1 (patch-ay) = 9b1dfa213491d8daf82ff8d5ee293d1279c64ce8
 SHA1 (patch-ba) = bd34391e522ae12ee63ec6a734f7a31116b2918d
 SHA1 (patch-bb) = 242c97ab4658838a6001d9c288e01209abfcee77
diff -r 6d5b784b7dae -r b4d97f9009d9 databases/mysql4-client/patches/patch-au
--- a/databases/mysql4-client/patches/patch-au  Fri Jul 29 19:34:48 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-au,v 1.1 2004/11/01 20:23:21 jdolecek Exp $
-
---- include/my_global.h.orig   2003-10-17 07:29:15.000000000 +0200
-+++ include/my_global.h        2003-12-11 15:13:14.000000000 +0100
-@@ -250,7 +250,7 @@
- # endif
- #endif /* TIME_WITH_SYS_TIME */
- #ifdef HAVE_UNISTD_H
--#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__)
-+#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__) && !defined(__NetBSD__)
- #define crypt unistd_crypt
- #endif
- #include <unistd.h>
diff -r 6d5b784b7dae -r b4d97f9009d9 databases/mysql4-client/patches/patch-av
--- a/databases/mysql4-client/patches/patch-av  Fri Jul 29 19:34:48 2005 +0000
+++ b/databases/mysql4-client/patches/patch-av  Fri Jul 29 21:02:35 2005 +0000
@@ -1,15 +1,15 @@
-$NetBSD: patch-av,v 1.3 2005/01/17 14:42:35 xtraeme Exp $
+$NetBSD: patch-av,v 1.4 2005/07/29 21:02:35 xtraeme Exp $
 
---- Makefile.in.orig   2005-01-17 15:05:45.000000000 +0100
-+++ Makefile.in        2005-01-17 15:06:09.000000000 +0100
-@@ -339,12 +339,7 @@
+--- 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 @@
  
  # 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 tests \
+-                      @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
diff -r 6d5b784b7dae -r b4d97f9009d9 databases/mysql4-client/patches/patch-ax
--- a/databases/mysql4-client/patches/patch-ax  Fri Jul 29 19:34:48 2005 +0000
+++ b/databases/mysql4-client/patches/patch-ax  Fri Jul 29 21:02:35 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ax,v 1.2 2005/01/10 15:47:18 xtraeme Exp $
+$NetBSD: patch-ax,v 1.3 2005/07/29 21:02:35 xtraeme Exp $
 
---- scripts/Makefile.in.orig   2005-01-10 13:42:12.000000000 +0100
-+++ scripts/Makefile.in        2005-01-10 13:43:10.000000000 +0100
-@@ -316,25 +316,10 @@
+--- scripts/Makefile.in.orig   2005-07-29 22:26:17.000000000 +0200
++++ scripts/Makefile.in        2005-07-29 22:27:18.000000000 +0200
+@@ -322,23 +322,10 @@
  vio_dir = @vio_dir@
  vio_libs = @vio_libs@
  zlib_dir = @zlib_dir@
@@ -23,12 +23,10 @@
 -                      mysql_explain_log \
 -                      mysql_tableinfo \
 -                      mysqld_multi \
--                      make_win_src_distribution \
--                      make_win_binary_distribution \
 +bin_SCRIPTS = msql2mysql mysql_config mysql_fix_privilege_tables \
-+            mysql_setpermission mysql_zap mysqlaccess mysqlbug \
-+            mysql_convert_table_format mysql_find_rows mysqlhotcopy \
-+            mysqldumpslow mysql_explain_log mysql_tableinfo \
++      mysql_setpermission mysql_zap mysqlaccess mysqlbug \
++      mysql_convert_table_format mysql_find_rows mysqlhotcopy \
++      mysqldumpslow mysql_explain_log mysql_tableinfo \
                        mysql_create_system_tables
  
  EXTRA_SCRIPTS = make_binary_distribution.sh \
diff -r 6d5b784b7dae -r b4d97f9009d9 databases/mysql4-server/Makefile
--- a/databases/mysql4-server/Makefile  Fri Jul 29 19:34:48 2005 +0000
+++ b/databases/mysql4-server/Makefile  Fri Jul 29 21:02:35 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/19 21:12:36 seb Exp $
+# $NetBSD: Makefile,v 1.20 2005/07/29 21:02:35 xtraeme Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-server-/}
-PKGREVISION=           1
+#PKGREVISION=          1
 SVR4_PKGNAME=          mysqs
 COMMENT=               MySQL 4, a free SQL database (server)
 
diff -r 6d5b784b7dae -r b4d97f9009d9 databases/mysql4-server/PLIST
--- a/databases/mysql4-server/PLIST     Fri Jul 29 19:34:48 2005 +0000
+++ b/databases/mysql4-server/PLIST     Fri Jul 29 21:02:35 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2005/06/19 21:12:36 seb Exp $
+@comment $NetBSD: PLIST,v 1.14 2005/07/29 21:02:35 xtraeme Exp $
 bin/comp_err
 bin/isamchk
 bin/isamlog
@@ -58,6 +58,7 @@
 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
 share/mysql-test/include/have_tis620.inc
@@ -65,13 +66,16 @@
 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/ps_conv.inc
 share/mysql-test/include/ps_create.inc
 share/mysql-test/include/ps_modify.inc
 share/mysql-test/include/ps_modify1.inc
 share/mysql-test/include/ps_query.inc
 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/install_test_db
 share/mysql-test/lib/init_db.sql
 share/mysql-test/lib/mtr_cases.pl
@@ -87,6 +91,7 @@
 share/mysql-test/r/alias.result
 share/mysql-test/r/alter_table.result
 share/mysql-test/r/analyse.result
+share/mysql-test/r/analyze.result
 share/mysql-test/r/ansi.result
 share/mysql-test/r/archive.result
 share/mysql-test/r/auto_increment.result
@@ -169,7 +174,9 @@
 share/mysql-test/r/func_crypt.result
 share/mysql-test/r/func_date_add.result
 share/mysql-test/r/func_default.result
+share/mysql-test/r/func_des_encrypt.result
 share/mysql-test/r/func_encrypt.result
+share/mysql-test/r/func_encrypt_nossl.result
 share/mysql-test/r/func_equal.result
 share/mysql-test/r/func_gconcat.result
 share/mysql-test/r/func_group.result
@@ -215,6 +222,7 @@
 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
 share/mysql-test/r/have_sjis.require
@@ -299,6 +307,7 @@
 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_openssl.require
 share/mysql-test/r/null.result
 share/mysql-test/r/null_key.result
 share/mysql-test/r/odbc.result
@@ -352,6 +361,7 @@
 share/mysql-test/r/rpl_charset.result
 share/mysql-test/r/rpl_commit_after_flush.result
 share/mysql-test/r/rpl_create_database.result
+share/mysql-test/r/rpl_ddl.result
 share/mysql-test/r/rpl_deadlock.result
 share/mysql-test/r/rpl_delete_all.result
 share/mysql-test/r/rpl_do_grant.result
@@ -368,6 +378,7 @@
 share/mysql-test/r/rpl_heap.result
 share/mysql-test/r/rpl_ignore_grant.result
 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_loaddata.result
@@ -385,6 +396,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_mystery22.result
 share/mysql-test/r/rpl_openssl.result
 share/mysql-test/r/rpl_optimize.result
@@ -453,6 +465,8 @@
 share/mysql-test/r/varbinary.result
 share/mysql-test/r/variables.result
 share/mysql-test/r/warnings.result
+share/mysql-test/server-cert.pem
+share/mysql-test/server-key.pem
 share/mysql-test/std_data/Moscow_leap
 share/mysql-test/std_data/cacert.pem
 share/mysql-test/std_data/client-cert.pem
@@ -463,15 +477,19 @@
 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/loaddata_pair.dat
 share/mysql-test/std_data/master-bin.000001
 share/mysql-test/std_data/rpl_loaddata.dat
 share/mysql-test/std_data/rpl_loaddata2.dat
+share/mysql-test/std_data/server-cert.pem
+share/mysql-test/std_data/server-key.pem
 share/mysql-test/std_data/trunc_binlog.000001
 share/mysql-test/std_data/warnings_loaddata.dat
 share/mysql-test/std_data/words.dat
 share/mysql-test/t/alias.test
 share/mysql-test/t/alter_table.test
 share/mysql-test/t/analyse.test
+share/mysql-test/t/analyze.test
 share/mysql-test/t/ansi.test
 share/mysql-test/t/archive.test
 share/mysql-test/t/auto_increment.test
@@ -558,8 +576,10 @@
 share/mysql-test/t/func_crypt.test
 share/mysql-test/t/func_date_add.test
 share/mysql-test/t/func_default.test
+share/mysql-test/t/func_des_encrypt.test
 share/mysql-test/t/func_encrypt-master.opt
 share/mysql-test/t/func_encrypt.test
+share/mysql-test/t/func_encrypt_nossl.test
 share/mysql-test/t/func_equal.test
 share/mysql-test/t/func_gconcat.test
 share/mysql-test/t/func_group.test
@@ -583,7 +603,6 @@
 share/mysql-test/t/gis.test
 share/mysql-test/t/grant.test
 share/mysql-test/t/grant2.test
-share/mysql-test/t/grant_cache-master.opt
 share/mysql-test/t/grant_cache.test
 share/mysql-test/t/group_by.test
 share/mysql-test/t/handler.test
@@ -744,6 +763,7 @@
 share/mysql-test/t/rpl_create_database-master.opt
 share/mysql-test/t/rpl_create_database-slave.opt
 share/mysql-test/t/rpl_create_database.test
+share/mysql-test/t/rpl_ddl.test
 share/mysql-test/t/rpl_deadlock-slave.opt
 share/mysql-test/t/rpl_deadlock.test
 share/mysql-test/t/rpl_delete_all.test
@@ -771,6 +791,7 @@
 share/mysql-test/t/rpl_ignore_grant.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
 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
@@ -798,6 +819,7 @@
 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_mystery22.test
 share/mysql-test/t/rpl_openssl.test
 share/mysql-test/t/rpl_optimize.test
diff -r 6d5b784b7dae -r b4d97f9009d9 databases/mysql4-server/distinfo
--- a/databases/mysql4-server/distinfo  Fri Jul 29 19:34:48 2005 +0000
+++ b/databases/mysql4-server/distinfo  Fri Jul 29 21:02:35 2005 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.18 2005/05/23 14:00:21 xtraeme Exp $
+$NetBSD: distinfo,v 1.19 2005/07/29 21:02:35 xtraeme Exp $
 
-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-aa) = abeac9fcc34ae3f4b9aa52e9b18380db2363155d
-SHA1 (patch-ab) = 0857856085c6d3d498cd404e7f8203a2b4d04ae8
-SHA1 (patch-ac) = 25c13c81ac15a254e18507b7ea8074993c8af00d
+SHA1 (mysql-4.1.13.tar.gz) = d9eb27277d2415ed3576fedde2d9ab7cdf6e2dcf
+RMD160 (mysql-4.1.13.tar.gz) = d257ec0f78cdc523a28f15d9a411d56f3bbc1b64



Home | Main Index | Thread Index | Old Index