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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fba01c60f1ce
branches:  trunk
changeset: 530941:fba01c60f1ce
user:      tron <tron%pkgsrc.org@localhost>
date:      Sun Jul 15 19:22:06 2007 +0000

description:
Update "mysql5-client" and "mysql5-server" packages to version 5.0.45.
Change since version 5.0.41:
- Functionality added or changed:
  - A new status variable, Com_call_procedure, indicates the number of calls
    to stored procedures. (Bug#27994)
  - NDB Cluster: The server source tree now includes scripts to simplify
    building MySQL with SCI support. For more information about SCI
    interconnects and these build scripts, see Section 15.9.1,
    Configuring MySQL Cluster to use SCI Sockets. (Bug#25470)
  - Prior to this release, when DATE values were compared with DATETIME values
    the time portion of the DATETIME value was ignored. Now a DATE value is
    coerced to the DATETIME type by adding the time portion as 00:00:00. To
    mimic the old behavior use the CAST() function in the following way:
    SELECT date_field = CAST(NOW() as DATE);. (Bug#28929)
- A large number of bugs including these security problems have been fixed:
  - A malformed password packet in the
    connection protocol could cause the server to crash. Thanks for Dormando
    for reporting this bug and providing details and a proof of concept.
    (Bug#28984)
  - CREATE TABLE LIKE did not require any privileges on the source table. Now
    it requires the SELECT privilege. (Bug#25578)
  - In addition, CREATE TABLE LIKE was not isolated from alteration by other
    connections, which resulted in various errors and incorrect binary log
    order when trying to execute concurrently a CREATE TABLE LIKE statement
    and either DDL statements on the source table or DML or DDL statements on
    the target table. (Bug#23667)

diffstat:

 databases/mysql5-client/Makefile.common  |   4 +-
 databases/mysql5-client/PLIST            |   3 +-
 databases/mysql5-client/distinfo         |  14 ++++------
 databases/mysql5-client/patches/patch-ac |  22 -----------------
 databases/mysql5-client/patches/patch-ad |  12 ++++----
 databases/mysql5-client/patches/patch-ae |  18 +++++++-------
 databases/mysql5-client/patches/patch-bg |  14 -----------
 databases/mysql5-server/PLIST            |  40 ++++++++++++++++++++++++--------
 databases/mysql5-server/distinfo         |  14 ++++------
 databases/mysql5-server/patches/patch-aa |  12 ++++----
 databases/mysql5-server/patches/patch-ac |  22 -----------------
 databases/mysql5-server/patches/patch-ah |  10 ++++----
 databases/mysql5-server/patches/patch-ao |  14 -----------
 13 files changed, 72 insertions(+), 127 deletions(-)

diffs (truncated from 515 to 300 lines):

diff -r 9a3a4e8cae97 -r fba01c60f1ce databases/mysql5-client/Makefile.common
--- a/databases/mysql5-client/Makefile.common   Sun Jul 15 19:11:25 2007 +0000
+++ b/databases/mysql5-client/Makefile.common   Sun Jul 15 19:22:06 2007 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.24 2007/07/09 22:34:27 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.25 2007/07/15 19:22:06 tron Exp $
 
-DISTNAME=              mysql-5.0.41
+DISTNAME=              mysql-5.0.45
 CATEGORIES=            databases
 MASTER_SITES=          ${MASTER_SITE_MYSQL:=MySQL-5.0/}
 
diff -r 9a3a4e8cae97 -r fba01c60f1ce databases/mysql5-client/PLIST
--- a/databases/mysql5-client/PLIST     Sun Jul 15 19:11:25 2007 +0000
+++ b/databases/mysql5-client/PLIST     Sun Jul 15 19:22:06 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2007/05/21 04:39:59 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.7 2007/07/15 19:22:06 tron Exp $
 bin/msql2mysql
 bin/mysql
 bin/mysql_config
@@ -31,6 +31,7 @@
 include/mysql/m_ctype.h
 include/mysql/m_string.h
 include/mysql/my_alloc.h
+include/mysql/my_attribute.h
 include/mysql/my_config.h
 include/mysql/my_dbug.h
 include/mysql/my_dir.h
diff -r 9a3a4e8cae97 -r fba01c60f1ce databases/mysql5-client/distinfo
--- a/databases/mysql5-client/distinfo  Sun Jul 15 19:11:25 2007 +0000
+++ b/databases/mysql5-client/distinfo  Sun Jul 15 19:22:06 2007 +0000
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.18 2007/05/21 04:39:59 xtraeme Exp $
+$NetBSD: distinfo,v 1.19 2007/07/15 19:22:06 tron Exp $
 
-SHA1 (mysql-5.0.41.tar.gz) = cc2a119c9e07173fce6d78fc87d96c6102eeab36
-RMD160 (mysql-5.0.41.tar.gz) = 57f2b5ac628814abd2b19a263cd2c90e3e20593d
-Size (mysql-5.0.41.tar.gz) = 24083795 bytes
+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 (patch-aa) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec
 SHA1 (patch-ab) = 9635c85a7c553ae6ab3cdd09f04d09ee1f537381
-SHA1 (patch-ac) = 87c795d0728f221e8d37b0711131f072bbadf1f1
-SHA1 (patch-ad) = e8e04a6beca500a0fd96b95b19fac13d7a662500
-SHA1 (patch-ae) = 4403c09d89cdb1f72275551aa17e1b4e04bb1ad9
+SHA1 (patch-ad) = 716c02583e87c99e69ebe00c64d4a4371487a666
+SHA1 (patch-ae) = 74c830dddf3517ebc2226dc166b61a33f83b04da
 SHA1 (patch-af) = 06cb76ad50ed0de3e82f682bf57a75441f68da26
 SHA1 (patch-ag) = 212f9c0a2e2eb6feb013e4a72eaf658951b995b5
 SHA1 (patch-ah) = 18f9bb2c6d9b88d04b9ade6177212ab2ed21b4d7
@@ -24,5 +23,4 @@
 SHA1 (patch-as) = d301a449e67d786f9155673fdbb5e8bc2f19ee7d
 SHA1 (patch-at) = 626c0f6926893aa05e261ca1921fb6a352819156
 SHA1 (patch-bf) = 87be24d45f0d3f48ea2b911025eb41696d088299
-SHA1 (patch-bg) = 32e63926587f59203eb4094139c3e0938a0bc877
 SHA1 (patch-bh) = 61ae8ad98f683418615a96f0dabb286a71642760
diff -r 9a3a4e8cae97 -r fba01c60f1ce databases/mysql5-client/patches/patch-ac
--- a/databases/mysql5-client/patches/patch-ac  Sun Jul 15 19:11:25 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2007/05/21 04:39:59 xtraeme Exp $
-
---- configure.in.orig  2007-05-21 05:53:04.000000000 +0200
-+++ configure.in       2007-05-21 05:53:27.000000000 +0200
-@@ -487,7 +487,7 @@
-   FIND_PROC="$PS \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
- else
-   case $SYSTEM_TYPE in
--    *freebsd*)
-+    *freebsd*|*dragonfly*)
-       FIND_PROC="$PS p \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
-       ;;
-     *darwin*)
-@@ -1121,7 +1121,7 @@
-       MAX_C_OPTIMIZE="-O"
-     fi
-     ;;
--  *freebsd*)
-+  *freebsd*|*dragonfly*)
-     AC_MSG_WARN([Adding fix for interrupted reads])
-     OSVERSION=`sysctl -a | grep osreldate | awk '{ print $2 }'`
-     if test "$OSVERSION" -gt "480100" && \
diff -r 9a3a4e8cae97 -r fba01c60f1ce databases/mysql5-client/patches/patch-ad
--- a/databases/mysql5-client/patches/patch-ad  Sun Jul 15 19:11:25 2007 +0000
+++ b/databases/mysql5-client/patches/patch-ad  Sun Jul 15 19:22:06 2007 +0000
@@ -1,15 +1,15 @@
-$NetBSD: patch-ad,v 1.5 2007/03/11 18:42:28 adam Exp $
+$NetBSD: patch-ad,v 1.6 2007/07/15 19:22:06 tron Exp $
 
---- Makefile.in.orig   2007-03-05 20:23:25.000000000 +0100
-+++ Makefile.in
-@@ -372,12 +372,7 @@ AUTOMAKE_OPTIONS = foreign
+--- Makefile.in.orig   2007-07-04 14:10:07.000000000 +0100
++++ Makefile.in        2007-07-15 17:20:48.000000000 +0100
+@@ -374,12 +374,7 @@
  EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
                        README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
  
 -SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
--                      @readline_topdir@ sql-common \
+-                      @readline_topdir@ sql-common scripts \
 -                      @thread_dirs@ pstack \
--                      @sql_union_dirs@ scripts @man_dirs@ tests \
+-                      @sql_union_dirs@ @man_dirs@ tests \
 -                      netware @libmysqld_dirs@ \
 -                      @bench_dirs@ support-files @tools_dirs@
 +SUBDIRS = . include strings @sql_client_dirs@ scripts man
diff -r 9a3a4e8cae97 -r fba01c60f1ce databases/mysql5-client/patches/patch-ae
--- a/databases/mysql5-client/patches/patch-ae  Sun Jul 15 19:11:25 2007 +0000
+++ b/databases/mysql5-client/patches/patch-ae  Sun Jul 15 19:22:06 2007 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.8 2007/05/21 04:40:00 xtraeme Exp $
+$NetBSD: patch-ae,v 1.9 2007/07/15 19:22:06 tron Exp $
 
---- scripts/Makefile.in.orig   2007-05-21 04:54:42.000000000 +0200
-+++ scripts/Makefile.in        2007-05-21 04:55:14.000000000 +0200
-@@ -355,13 +355,12 @@
- yassl_libs = @yassl_libs@
- yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
- zlib_dir = @zlib_dir@
+--- scripts/Makefile.in.orig   2007-07-04 14:10:00.000000000 +0100
++++ scripts/Makefile.in        2007-07-15 17:24:02.000000000 +0100
+@@ -377,13 +377,12 @@
+ BUILT_SOURCES = mysql_fix_privilege_tables.sql \
+               mysql_fix_privilege_tables_sql.c
+ 
 -bin_SCRIPTS = @server_scripts@ \
-+bin_SCRIPTS =  \
++bin_SCRIPTS = \
                        msql2mysql \
                        mysql_config \
                        mysql_fix_privilege_tables \
@@ -17,7 +17,7 @@
                        mysql_zap \
                        mysqlaccess \
                        mysqlbug \
-@@ -372,7 +371,6 @@
+@@ -394,7 +393,6 @@
                        mysql_explain_log \
                        mysql_tableinfo \
                        mysql_upgrade_shell \
diff -r 9a3a4e8cae97 -r fba01c60f1ce databases/mysql5-client/patches/patch-bg
--- a/databases/mysql5-client/patches/patch-bg  Sun Jul 15 19:11:25 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-bg,v 1.1 2007/05/21 04:40:00 xtraeme Exp $
-
-
---- sql/sql_parse.cc.orig      2007-05-21 04:56:56.000000000 +0200
-+++ sql/sql_parse.cc   2007-05-21 04:59:31.000000000 +0200
-@@ -3304,7 +3304,7 @@
-       */
-       old_list= table[0];
-       new_list= table->next_local[0];
--      if (check_grant(thd, ALTER_ACL, &old_list, 0, 1, 0) ||
-+      if (check_grant(thd, ALTER_ACL | DROP_ACL, &old_list, 0, 1, 0) ||
-           (!test_all_bits(table->next_local->grant.privilege,
-                           INSERT_ACL | CREATE_ACL) &&
-            check_grant(thd, INSERT_ACL | CREATE_ACL, &new_list, 0, 1, 0)))
diff -r 9a3a4e8cae97 -r fba01c60f1ce databases/mysql5-server/PLIST
--- a/databases/mysql5-server/PLIST     Sun Jul 15 19:11:25 2007 +0000
+++ b/databases/mysql5-server/PLIST     Sun Jul 15 19:22:06 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2007/05/21 04:40:00 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.11 2007/07/15 19:22:06 tron Exp $
 bin/comp_err
 bin/innochecksum
 bin/my_print_defaults
@@ -69,7 +69,9 @@
 share/mysql-test/include/have_geometry.inc
 share/mysql-test/include/have_innodb.inc
 share/mysql-test/include/have_latin2_ch.inc
+share/mysql-test/include/have_log_bin.inc
 share/mysql-test/include/have_lowercase0.inc
+share/mysql-test/include/have_lowercase1.inc
 share/mysql-test/include/have_multi_ndb.inc
 share/mysql-test/include/have_ndb.inc
 share/mysql-test/include/have_outfile.inc
@@ -82,7 +84,6 @@
 share/mysql-test/include/have_ujis.inc
 share/mysql-test/include/im_check_env.inc
 share/mysql-test/include/innodb_rollback_on_timeout.inc
-share/mysql-test/include/is_debug_build.inc
 share/mysql-test/include/loaddata_autocom.inc
 share/mysql-test/include/master-slave.inc
 share/mysql-test/include/mysqltest-x.inc
@@ -101,6 +102,7 @@
 share/mysql-test/include/ps_renew.inc
 share/mysql-test/include/report-features.test
 share/mysql-test/include/rpl_stmt_seq.inc
+share/mysql-test/include/show_binlog_events.inc
 share/mysql-test/include/show_msg.inc
 share/mysql-test/include/show_msg80.inc
 share/mysql-test/include/sp-vars.inc
@@ -108,8 +110,13 @@
 share/mysql-test/include/system_db_struct.inc
 share/mysql-test/include/test_outfile.inc
 share/mysql-test/include/testdb_only.inc
+share/mysql-test/include/uses_vardir.inc
 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_sql_to_stop.inc
+share/mysql-test/include/wait_for_slave_to_start.inc
+share/mysql-test/include/wait_for_slave_to_stop.inc
 share/mysql-test/include/wait_show_pattern.inc
 share/mysql-test/include/wait_slave_status.inc
 share/mysql-test/include/windows.inc
@@ -154,6 +161,7 @@
 share/mysql-test/r/bigint.result
 share/mysql-test/r/binary.result
 share/mysql-test/r/binlog.result
+share/mysql-test/r/binlog_killed.result
 share/mysql-test/r/blackhole.result
 share/mysql-test/r/bool.result
 share/mysql-test/r/bootstrap.result
@@ -183,7 +191,6 @@
 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_cp932_notembedded.result
 share/mysql-test/r/ctype_create.result
 share/mysql-test/r/ctype_eucjpms.result
 share/mysql-test/r/ctype_euckr.result
@@ -216,6 +223,7 @@
 share/mysql-test/r/drop_temp_table.result
 share/mysql-test/r/empty_table.result
 share/mysql-test/r/endspace.result
+share/mysql-test/r/error_simulation.result
 share/mysql-test/r/errors.result
 share/mysql-test/r/exampledb.result
 share/mysql-test/r/execution_constants.result
@@ -224,7 +232,6 @@
 share/mysql-test/r/federated_archive.result
 share/mysql-test/r/federated_bug_13118.result
 share/mysql-test/r/fix_priv_tables.result
-share/mysql-test/r/fix_priv_tabs.result
 share/mysql-test/r/flush.result
 share/mysql-test/r/flush2.result
 share/mysql-test/r/flush_block_commit.result
@@ -297,6 +304,7 @@
 share/mysql-test/r/have_geometry.require
 share/mysql-test/r/have_innodb.require
 share/mysql-test/r/have_latin2_ch.require
+share/mysql-test/r/have_log_bin.require
 share/mysql-test/r/have_met_timezone.require
 share/mysql-test/r/have_moscow_leap_timezone.require
 share/mysql-test/r/have_mysql_upgrade.result
@@ -374,9 +382,12 @@
 share/mysql-test/r/lock.result
 share/mysql-test/r/lock_multi.result
 share/mysql-test/r/lock_tables_lost_commit.result
+share/mysql-test/r/long_tmpdir.result
 share/mysql-test/r/lowercase0.require
+share/mysql-test/r/lowercase1.require
 share/mysql-test/r/lowercase2.require
 share/mysql-test/r/lowercase_fs_off.result
+share/mysql-test/r/lowercase_mixed_tmpdir.result
 share/mysql-test/r/lowercase_table.result
 share/mysql-test/r/lowercase_table2.result
 share/mysql-test/r/lowercase_table3.result
@@ -510,6 +521,7 @@
 share/mysql-test/r/rpl_charset_sjis.result
 share/mysql-test/r/rpl_commit_after_flush.result
 share/mysql-test/r/rpl_create_database.result
+share/mysql-test/r/rpl_critical_errors.result
 share/mysql-test/r/rpl_ddl.result
 share/mysql-test/r/rpl_deadlock.result
 share/mysql-test/r/rpl_delete_all.result
@@ -611,6 +623,7 @@
 share/mysql-test/r/sp_notembedded.result
 share/mysql-test/r/sp_stress_case.result
 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.result
 share/mysql-test/r/ssl_compress.result
@@ -675,6 +688,7 @@
 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-big.result
 share/mysql-test/r/variables.result
 share/mysql-test/r/view.result
 share/mysql-test/r/view_grant.result
@@ -772,7 +786,6 @@
 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/a_version_check.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
@@ -794,7 +807,6 @@
 share/mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
 share/mysql-test/suite/funcs_1/r/innodb_triggers.result
 share/mysql-test/suite/funcs_1/r/innodb_views.result
-share/mysql-test/suite/funcs_1/r/innodb_views.warnings