[pkgsrc/trunk]: pkgsrc/databases Update "mysql5-client" and "mysql5-server" p...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a5219f66b0d8
branches:  trunk
changeset: 536456:a5219f66b0d8
user:      tron <tron%pkgsrc.org@localhost>
date:      Fri Dec 14 13:36:52 2007 +0000

description:
Update "mysql5-client" and "mysql5-server" packages to version 5.0.51.
This version fixes a lot of bugs including the security vulnerability
reported in CVE-2007-5969.

A complete list of the changes can be found here:
http://dev.mysql.com/doc/refman/5.0/en/releasenotes-cs-5-0-51.html

diffstat:

 databases/mysql5-client/Makefile         |    3 +-
 databases/mysql5-client/Makefile.common  |    4 +-
 databases/mysql5-client/distinfo         |    8 +-
 databases/mysql5-server/Makefile         |   10 +-
 databases/mysql5-server/PLIST            |  166 +++++++++++++-----------------
 databases/mysql5-server/distinfo         |   14 +-
 databases/mysql5-server/patches/patch-ab |   16 +-
 databases/mysql5-server/patches/patch-ak |   12 +-
 databases/mysql5-server/patches/patch-an |   22 ++-
 9 files changed, 119 insertions(+), 136 deletions(-)

diffs (truncated from 687 to 300 lines):

diff -r d14212273aaf -r a5219f66b0d8 databases/mysql5-client/Makefile
--- a/databases/mysql5-client/Makefile  Fri Dec 14 13:35:04 2007 +0000
+++ b/databases/mysql5-client/Makefile  Fri Dec 14 13:36:52 2007 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2007/12/08 22:26:24 jnemeth Exp $
+# $NetBSD: Makefile,v 1.14 2007/12/14 13:36:52 tron Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-client-/}
 SVR4_PKGNAME=          mysqc
-PKGREVISION=           2
 COMMENT=               MySQL 5, a free SQL database (client)
 
 CONFLICTS=             {mysql-client-[0-9]*,mysql3-client-[0-9]*}
diff -r d14212273aaf -r a5219f66b0d8 databases/mysql5-client/Makefile.common
--- a/databases/mysql5-client/Makefile.common   Fri Dec 14 13:35:04 2007 +0000
+++ b/databases/mysql5-client/Makefile.common   Fri Dec 14 13:36:52 2007 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.27 2007/10/16 23:49:00 tnn Exp $
+# $NetBSD: Makefile.common,v 1.28 2007/12/14 13:36:52 tron Exp $
 
-DISTNAME=              mysql-5.0.45
+DISTNAME=              mysql-5.0.51
 CATEGORIES=            databases
 MASTER_SITES=          ${MASTER_SITE_MYSQL:=MySQL-5.0/}
 
diff -r d14212273aaf -r a5219f66b0d8 databases/mysql5-client/distinfo
--- a/databases/mysql5-client/distinfo  Fri Dec 14 13:35:04 2007 +0000
+++ b/databases/mysql5-client/distinfo  Fri Dec 14 13:36:52 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.20 2007/10/12 14:32:46 rillig Exp $
+$NetBSD: distinfo,v 1.21 2007/12/14 13:36:52 tron Exp $
 
-SHA1 (mysql-5.0.45.tar.gz) = a5fba8e004acc43ac1a576d728f10215f54ebe20
-RMD160 (mysql-5.0.45.tar.gz) = ee6717c65dc7bb6b5b596b90ef6c47c7fdebf5fb
-Size (mysql-5.0.45.tar.gz) = 24433261 bytes
+SHA1 (mysql-5.0.51.tar.gz) = a9a253ea842e973df6f475c04dac77522de0dea7
+RMD160 (mysql-5.0.51.tar.gz) = e14baa1c40cb385fa64fc72355db9ca58a6be2f9
+Size (mysql-5.0.51.tar.gz) = 27045586 bytes
 SHA1 (patch-aa) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec
 SHA1 (patch-ab) = 9635c85a7c553ae6ab3cdd09f04d09ee1f537381
 SHA1 (patch-ad) = 430b8ae2d13598eec90cfdc73d37d932dd97f217
diff -r d14212273aaf -r a5219f66b0d8 databases/mysql5-server/Makefile
--- a/databases/mysql5-server/Makefile  Fri Dec 14 13:35:04 2007 +0000
+++ b/databases/mysql5-server/Makefile  Fri Dec 14 13:36:52 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/07/31 14:10:11 obache Exp $
+# $NetBSD: Makefile,v 1.20 2007/12/14 13:36:53 tron Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-server-/}
 SVR4_PKGNAME=          mysqs
@@ -36,7 +36,11 @@
 BUILD_DEFS+=           MYSQL_DATADIR
 BUILD_DIRS=            . man
 
-REPLACE_PERL+=         mysql-test/mysql-test-run.pl
+REPLACE_PERL+=         mysql-test/mysql-test-run.pl \
+                       mysql-test/suite/funcs_1/lib/DataGen_local.pl \
+                       mysql-test/suite/funcs_1/lib/DataGen_modify.pl \
+                       mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl \
+                       mysql-test/mysql-stress-test.pl
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -51,7 +55,7 @@
 .include "../../security/tcp_wrappers/buildlink3.mk"
 
 post-configure:
-       cd ${WRKSRC} && cp -f config.h include/my_config.h
+       cd ${WRKSRC}/include && cp -f config.h my_config.h
 
 post-build:
        cd ${WRKSRC}/scripts && env ${MAKE_ENV} ${MAKE_PROGRAM} \
diff -r d14212273aaf -r a5219f66b0d8 databases/mysql5-server/PLIST
--- a/databases/mysql5-server/PLIST     Fri Dec 14 13:35:04 2007 +0000
+++ b/databases/mysql5-server/PLIST     Fri Dec 14 13:36:52 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2007/07/15 19:22:06 tron Exp $
+@comment $NetBSD: PLIST,v 1.12 2007/12/14 13:36:53 tron Exp $
 bin/comp_err
 bin/innochecksum
 bin/my_print_defaults
@@ -30,9 +30,6 @@
 man/man8/mysqlmanager.8
 share/examples/rc.d/mysqld
 share/mysql-test/README
-share/mysql-test/cacert.pem
-share/mysql-test/client-cert.pem
-share/mysql-test/client-key.pem
 share/mysql-test/include/add_anonymous_users.inc
 share/mysql-test/include/analyze_failure_sync_with_master.test
 share/mysql-test/include/big_test.inc
@@ -53,6 +50,7 @@
 share/mysql-test/include/have_bdb.inc
 share/mysql-test/include/have_big5.inc
 share/mysql-test/include/have_blackhole.inc
+share/mysql-test/include/have_bug25714.inc
 share/mysql-test/include/have_case_sensitive_file_system.inc
 share/mysql-test/include/have_compress.inc
 share/mysql-test/include/have_cp1250_ch.inc
@@ -114,6 +112,7 @@
 share/mysql-test/include/varchar.inc
 share/mysql-test/include/wait_for_query_to_suceed.inc
 share/mysql-test/include/wait_for_slave_io_to_stop.inc
+share/mysql-test/include/wait_for_slave_param.inc
 share/mysql-test/include/wait_for_slave_sql_to_stop.inc
 share/mysql-test/include/wait_for_slave_to_start.inc
 share/mysql-test/include/wait_for_slave_to_stop.inc
@@ -135,6 +134,7 @@
 share/mysql-test/lib/mtr_timer.pl
 share/mysql-test/lib/mtr_unique.pl
 share/mysql-test/mtr
+share/mysql-test/mysql-stress-test.pl
 share/mysql-test/mysql-test-run
 share/mysql-test/mysql-test-run-shell
 share/mysql-test/mysql-test-run.pl
@@ -144,6 +144,7 @@
 share/mysql-test/r/analyse.result
 share/mysql-test/r/analyze.result
 share/mysql-test/r/ansi.result
+share/mysql-test/r/archive-big.result
 share/mysql-test/r/archive.result
 share/mysql-test/r/archive_gis.result
 share/mysql-test/r/auto_increment.result
@@ -161,6 +162,7 @@
 share/mysql-test/r/bigint.result
 share/mysql-test/r/binary.result
 share/mysql-test/r/binlog.result
+share/mysql-test/r/binlog_innodb.result
 share/mysql-test/r/binlog_killed.result
 share/mysql-test/r/blackhole.result
 share/mysql-test/r/bool.result
@@ -185,6 +187,7 @@
 share/mysql-test/r/create_not_windows.result
 share/mysql-test/r/create_select_tmp.result
 share/mysql-test/r/csv.result
+share/mysql-test/r/ctype_ascii.result
 share/mysql-test/r/ctype_big5.result
 share/mysql-test/r/ctype_collate.result
 share/mysql-test/r/ctype_cp1250_ch.result
@@ -201,6 +204,7 @@
 share/mysql-test/r/ctype_latin1_de.result
 share/mysql-test/r/ctype_latin2.result
 share/mysql-test/r/ctype_latin2_ch.result
+share/mysql-test/r/ctype_ldml.result
 share/mysql-test/r/ctype_many.result
 share/mysql-test/r/ctype_mb.result
 share/mysql-test/r/ctype_recoding.result
@@ -231,6 +235,8 @@
 share/mysql-test/r/federated.result
 share/mysql-test/r/federated_archive.result
 share/mysql-test/r/federated_bug_13118.result
+share/mysql-test/r/federated_bug_25714.result
+share/mysql-test/r/federated_innodb.result
 share/mysql-test/r/fix_priv_tables.result
 share/mysql-test/r/flush.result
 share/mysql-test/r/flush2.result
@@ -241,6 +247,7 @@
 share/mysql-test/r/foreign_key.result
 share/mysql-test/r/fulltext.result
 share/mysql-test/r/fulltext2.result
+share/mysql-test/r/fulltext3.result
 share/mysql-test/r/fulltext_cache.result
 share/mysql-test/r/fulltext_distinct.result
 share/mysql-test/r/fulltext_left_join.result
@@ -289,6 +296,7 @@
 share/mysql-test/r/have_bdb.require
 share/mysql-test/r/have_big5.require
 share/mysql-test/r/have_blackhole.require
+share/mysql-test/r/have_bug25714.require
 share/mysql-test/r/have_compress.require
 share/mysql-test/r/have_cp1250_ch.require
 share/mysql-test/r/have_cp932.require
@@ -410,6 +418,7 @@
 share/mysql-test/r/mysqlbinlog.result
 share/mysql-test/r/mysqlbinlog2.result
 share/mysql-test/r/mysqlcheck.result
+share/mysql-test/r/mysqldump-compat.result
 share/mysql-test/r/mysqldump-max.result
 share/mysql-test/r/mysqldump.result
 share/mysql-test/r/mysqlshow.result
@@ -419,9 +428,11 @@
 share/mysql-test/r/ndb_autodiscover.result
 share/mysql-test/r/ndb_autodiscover2.result
 share/mysql-test/r/ndb_autodiscover3.result
+share/mysql-test/r/ndb_backup_print.result
 share/mysql-test/r/ndb_basic.result
 share/mysql-test/r/ndb_bitfield.result
 share/mysql-test/r/ndb_blob.result
+share/mysql-test/r/ndb_bug26793.result
 share/mysql-test/r/ndb_cache.result
 share/mysql-test/r/ndb_cache2.result
 share/mysql-test/r/ndb_cache_multi.result
@@ -447,6 +458,7 @@
 share/mysql-test/r/ndb_rename.result
 share/mysql-test/r/ndb_replace.result
 share/mysql-test/r/ndb_restore.result
+share/mysql-test/r/ndb_restore_different_endian_data.result
 share/mysql-test/r/ndb_restore_print.result
 share/mysql-test/r/ndb_single_user.result
 share/mysql-test/r/ndb_subquery.result
@@ -471,6 +483,7 @@
 share/mysql-test/r/outfile.result
 share/mysql-test/r/overflow.result
 share/mysql-test/r/packet.result
+share/mysql-test/r/parser_precedence.result
 share/mysql-test/r/perror.result
 share/mysql-test/r/preload.result
 share/mysql-test/r/profiling.result
@@ -488,6 +501,7 @@
 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/query_cache_with_views.result
 share/mysql-test/r/raid.result
 share/mysql-test/r/range.result
 share/mysql-test/r/read_only.result
@@ -537,6 +551,7 @@
 share/mysql-test/r/rpl_flush_tables.result
 share/mysql-test/r/rpl_free_items.result
 share/mysql-test/r/rpl_get_lock.result
+share/mysql-test/r/rpl_grant.result
 share/mysql-test/r/rpl_ignore_grant.result
 share/mysql-test/r/rpl_ignore_revoke.result
 share/mysql-test/r/rpl_ignore_table.result
@@ -625,7 +640,9 @@
 share/mysql-test/r/sp_trans.result
 share/mysql-test/r/sp_trans_log.result
 share/mysql-test/r/sql_mode.result
+share/mysql-test/r/ssl-big.result
 share/mysql-test/r/ssl.result
+share/mysql-test/r/ssl_8k_key.result
 share/mysql-test/r/ssl_compress.result
 share/mysql-test/r/ssl_connect.result
 share/mysql-test/r/status.result
@@ -692,14 +709,13 @@
 share/mysql-test/r/variables.result
 share/mysql-test/r/view.result
 share/mysql-test/r/view_grant.result
-share/mysql-test/r/view_query_cache.result
 share/mysql-test/r/wait_timeout.result
 share/mysql-test/r/warnings.result
 share/mysql-test/r/windows.result
+share/mysql-test/r/windows_shm.result
 share/mysql-test/r/xa.result
-share/mysql-test/server-cert.pem
-share/mysql-test/server-key.pem
 share/mysql-test/std_data/14897.frm
+share/mysql-test/std_data/Index.xml
 share/mysql-test/std_data/Moscow_leap
 share/mysql-test/std_data/bad_gis_data.dat
 share/mysql-test/std_data/bug15328.cnf
@@ -721,6 +737,18 @@
 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_backup50_data_be/BACKUP-1-0.1.Data
+share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1-0.2.Data
+share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.ctl
+share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.1.log
+share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.ctl
+share/mysql-test/std_data/ndb_backup50_data_be/BACKUP-1.2.log
+share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.1.Data
+share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1-0.2.Data
+share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.ctl
+share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.1.log
+share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.ctl
+share/mysql-test/std_data/ndb_backup50_data_le/BACKUP-1.2.log
 share/mysql-test/std_data/ndb_config_mycnf1.cnf
 share/mysql-test/std_data/ndb_config_mycnf2.cnf
 share/mysql-test/std_data/rpl_loaddata.dat
@@ -730,6 +758,8 @@
 share/mysql-test/std_data/server-cert.pem
 share/mysql-test/std_data/server-key-des.pem
 share/mysql-test/std_data/server-key.pem
+share/mysql-test/std_data/server8k-cert.pem
+share/mysql-test/std_data/server8k-key.pem
 share/mysql-test/std_data/trunc_binlog.000001
 share/mysql-test/std_data/untrusted-cacert.pem
 share/mysql-test/std_data/vchar.frm
@@ -786,6 +816,8 @@
 share/mysql-test/suite/funcs_1/include/sp_tb.inc
 share/mysql-test/suite/funcs_1/lib/DataGen_local.pl
 share/mysql-test/suite/funcs_1/lib/DataGen_modify.pl
+share/mysql-test/suite/funcs_1/r/datadict_help_tables_build.result
+share/mysql-test/suite/funcs_1/r/datadict_help_tables_dev.result
 share/mysql-test/suite/funcs_1/r/innodb__datadict.result
 share/mysql-test/suite/funcs_1/r/innodb__load.result
 share/mysql-test/suite/funcs_1/r/innodb_bitdata.result
@@ -857,6 +889,8 @@
 share/mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc
 share/mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
 share/mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
+share/mysql-test/suite/funcs_1/t/datadict_help_tables_build.test
+share/mysql-test/suite/funcs_1/t/datadict_help_tables_dev.test
 share/mysql-test/suite/funcs_1/t/disabled.def
 share/mysql-test/suite/funcs_1/t/innodb__datadict.test
 share/mysql-test/suite/funcs_1/t/innodb__load.test
@@ -948,95 +982,16 @@
 share/mysql-test/suite/funcs_2/t/memory_charset.test
 share/mysql-test/suite/funcs_2/t/myisam_charset.test