Pullup ticket 1823 - requested by seb

security update for mysql4

Revisions pulled up:
- pkgsrc/databases/mysql4-client/Makefile.common	1.54
- pkgsrc/databases/mysql4-client/PLIST			1.14
- pkgsrc/databases/mysql4-client/distinfo		1.27
- pkgsrc/databases/mysql4-client/patches/patch-ax	1.5
- pkgsrc/databases/mysql4-client/patches/patch-bd	1.2
- pkgsrc/databases/mysql4-server/Makefile		1.31
- pkgsrc/databases/mysql4-server/PLIST			1.18
- pkgsrc/databases/mysql4-server/distinfo		1.25
- pkgsrc/databases/mysql4-server/patches/patch-bd	1.2

   Module Name:		pkgsrc
   Committed By:	seb
   Date:		Thu Aug 31 12:42:42 UTC 2006

   Modified Files:
   	pkgsrc/databases/mysql4-client: Makefile.common PLIST distinfo
   	pkgsrc/databases/mysql4-client/patches: patch-ax patch-bd
   	pkgsrc/databases/mysql4-server: Makefile PLIST distinfo
   	pkgsrc/databases/mysql4-server/patches: patch-bd

   Log Message:
   Update mysql4-client and mysql4-server to version 4.1.21.

   Most notably this version includes fixes for:
   http://secunia.com/advisories/21259/
   http://secunia.com/advisories/21506/
   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-3469

   * Packages changes:
   the script mysqldumpslow had been moved from the mysql4-client to the
   mysql4-server.

   * Changes since last packaged version (4.1.20)
   (see http://dev.mysql.com/doc/refman/4.1/en/news-4-1-21.html for more details):

   This is a bugfix release for the recent production release family.

   Functionality added or changed:
   - For spatial data types, the server formerly returned these as
   VARSTRING values with a binary collation. Now the server returns
   spatial values as BLOB values. (Bug#10166)
   - Added the --set-charset option to mysqlbinlog to allow the
   character set to be specified for processing binary log files.
   (Bug#18351)
   - For a table with an AUTO_INCREMENT column, SHOW CREATE TABLE now
   shows the next AUTO_INCREMENT value to be generated. (Bug#19025)
   - A warning now is issued if the client attempts to set the
   SQL_LOG_OFF variable without the SUPER privilege. (Bug#16180)
   - The mysqldumpslow script has been moved from client RPM packages
   to server RPM packages. This corrects a problem where mysqldumpslow
   could not be used with a client-only RPM install, because it depends
   on my_print_defaults which is in the server RPM. (Bug#20216)

   Bugs fixed:
   - Security fix: On Linux, and possibly other platforms using
   case-sensitive filesystems, it was possible for a user granted
   rights on a database to create or access a database whose name
   differed only from that of the first by the case of one or more
   letters. (Bug#17647)
   - Security fix: If a user has access to MyISAM table t, that user
   can create a MERGE table m that accesses t. However, if the user's
   privileges on t are subsequently revoked, the user can continue to
   access t by doing so through m. If this behavior is undesirable,
   you can start the server with the new --skip-merge option to disable
   the MERGE storage engine. (Bug#15195)
   - Security fix: Invalid arguments to DATE_FORMAT() caused a server
   crash. (CVE-2006-3469, Bug#20729) Thanks to Jean-David Maillefer
   for discovering and reporting this problem to the Debian project
   and to Christian Hammers from the Debian Team for notifying us of
   it.
   ...
   (see http://dev.mysql.com/doc/refman/4.1/en/news-4-1-21.html for
   the complete
   bug fix list)

1 files changed, 14 insertions, 1 deletions

diff --git a/databases/mysql4-server/PLIST b/databases/mysql4-server/PLIST
index 6b9d73c85e8..e8e4683d670 100644
--- a/databases/mysql4-server/PLIST
+++ b/databases/mysql4-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2006/05/26 18:25:34 seb Exp $
+@comment $NetBSD: PLIST,v 1.17.2.1 2006/09/13 13:35:59 salo Exp $
 bin/comp_err
 bin/isamchk
 bin/isamlog
@@ -14,6 +14,7 @@ bin/mysql_secure_installation
 bin/mysql_tzinfo_to_sql
 bin/mysql_waitpid
 bin/mysqld_safe
+bin/mysqldumpslow
 bin/pack_isam
 bin/perror
 bin/replace
@@ -57,6 +58,7 @@ share/mysql-test/include/have_archive.inc
 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_case_sensitive_file_system.inc
 share/mysql-test/include/have_compress.inc
 share/mysql-test/include/have_cp1250_ch.inc
 share/mysql-test/include/have_cp932.inc
@@ -134,6 +136,7 @@ share/mysql-test/r/blackhole.result
 share/mysql-test/r/bool.result
 share/mysql-test/r/bulk_replace.result
 share/mysql-test/r/case.result
+share/mysql-test/r/case_sensitive_file_system.require
 share/mysql-test/r/cast.result
 share/mysql-test/r/check.result
 share/mysql-test/r/check_var_limit.require
@@ -299,6 +302,7 @@ share/mysql-test/r/lock_multi.result
 share/mysql-test/r/lock_tables_lost_commit.result
 share/mysql-test/r/lowercase0.require
 share/mysql-test/r/lowercase2.require
+share/mysql-test/r/lowercase_fs_off.result
 share/mysql-test/r/lowercase_table.result
 share/mysql-test/r/lowercase_table2.result
 share/mysql-test/r/lowercase_table3.result
@@ -311,6 +315,7 @@ 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.result
+share/mysql-test/r/mysql_client.result
 share/mysql-test/r/mysql_protocols.result
 share/mysql-test/r/mysqlbinlog.result
 share/mysql-test/r/mysqlbinlog2.result
@@ -319,6 +324,7 @@ share/mysql-test/r/mysqltest.result
 share/mysql-test/r/ndb_alter_table.result
 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_basic.result
 share/mysql-test/r/ndb_blob.result
 share/mysql-test/r/ndb_cache.result
@@ -332,9 +338,11 @@ share/mysql-test/r/ndb_index_unique.result
 share/mysql-test/r/ndb_insert.result
 share/mysql-test/r/ndb_limit.result
 share/mysql-test/r/ndb_load.result
+share/mysql-test/r/ndb_loaddatalocal.result
 share/mysql-test/r/ndb_lock.result
 share/mysql-test/r/ndb_minmax.result
 share/mysql-test/r/ndb_multi.result
+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_subquery.result
@@ -703,6 +711,7 @@ share/mysql-test/t/lock.test
 share/mysql-test/t/lock_multi.test
 share/mysql-test/t/lock_tables_lost_commit-master.opt
 share/mysql-test/t/lock_tables_lost_commit.test
+share/mysql-test/t/lowercase_fs_off.test
 share/mysql-test/t/lowercase_table-master.opt
 share/mysql-test/t/lowercase_table.test
 share/mysql-test/t/lowercase_table2.test
@@ -723,6 +732,7 @@ share/mysql-test/t/multi_update.test
 share/mysql-test/t/myisam-blob-master.opt
 share/mysql-test/t/myisam-blob.test
 share/mysql-test/t/myisam.test
+share/mysql-test/t/mysql_client.test
 share/mysql-test/t/mysql_client_test.test
 share/mysql-test/t/mysql_protocols.test
 share/mysql-test/t/mysqlbinlog-master.opt
@@ -734,6 +744,7 @@ share/mysql-test/t/ndb_alter_table.test
 share/mysql-test/t/ndb_autodiscover.test
 share/mysql-test/t/ndb_autodiscover2-master.opt
 share/mysql-test/t/ndb_autodiscover2.test
+share/mysql-test/t/ndb_autodiscover3.test
 share/mysql-test/t/ndb_basic.test
 share/mysql-test/t/ndb_blob.test
 share/mysql-test/t/ndb_cache.test
@@ -746,9 +757,11 @@ share/mysql-test/t/ndb_index_unique.test
 share/mysql-test/t/ndb_insert.test
 share/mysql-test/t/ndb_limit.test
 share/mysql-test/t/ndb_load.test
+share/mysql-test/t/ndb_loaddatalocal.test
 share/mysql-test/t/ndb_lock.test
 share/mysql-test/t/ndb_minmax.test
 share/mysql-test/t/ndb_multi.test
+share/mysql-test/t/ndb_rename.test
 share/mysql-test/t/ndb_replace.test
 share/mysql-test/t/ndb_restore.test
 share/mysql-test/t/ndb_subquery.test