Update "mysql5-client" and "mysql5-server" packages to version 5.0.24.

Changes since version 5.0.22:
- 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)
- In the INFORMATION_SCHEMA.ROUTINES table the ROUTINE_DEFINITION
  column now is defined as NULL rather than NOT NULL. Also, NULL rather
  than the empty string is returned as the column value if the user does
  not have sufficient privileges to see the routine
  definition. (Bug#20230)
- Several other bug fixes

5 files changed, 95 insertions, 29 deletions

diff --git a/databases/mysql5-server/Makefile b/databases/mysql5-server/Makefile
index 6f6d0eb73c4..f3b53f0686f 100644
--- a/databases/mysql5-server/Makefile
+++ b/databases/mysql5-server/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2006/07/12 11:56:05 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2006/08/06 16:30:40 tron Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
 SVR4_PKGNAME=		mysqs
-PKGREVISION=		1
 COMMENT=		MySQL 5, a free SQL database (server)
 
 CONFLICTS=		{mysql-server-[0-9]*,mysql3-server-[0-9]*}
diff --git a/databases/mysql5-server/PLIST b/databases/mysql5-server/PLIST
index f1b61d23e5c..64ddcca54c5 100644
--- a/databases/mysql5-server/PLIST
+++ b/databases/mysql5-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/05/18 16:11:15 cube Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/08/06 16:30:40 tron Exp $
 bin/comp_err
 bin/innochecksum
 bin/my_print_defaults
@@ -80,6 +80,7 @@ share/mysql-test/include/master-slave.inc
 share/mysql-test/include/mysqltest-x.inc
 share/mysql-test/include/mysqltest_while.inc
 share/mysql-test/include/ndb_default_cluster.inc
+share/mysql-test/include/not_as_root.inc
 share/mysql-test/include/not_embedded.inc
 share/mysql-test/include/not_openssl.inc
 share/mysql-test/include/not_windows.inc
@@ -155,6 +156,7 @@ share/mysql-test/r/count_distinct.result
 share/mysql-test/r/count_distinct2.result
 share/mysql-test/r/count_distinct3.result
 share/mysql-test/r/create.result
+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_big5.result
@@ -274,6 +276,7 @@ share/mysql-test/r/have_latin2_ch.require
 share/mysql-test/r/have_met_timezone.require
 share/mysql-test/r/have_moscow_leap_timezone.require
 share/mysql-test/r/have_ndb.require
+share/mysql-test/r/have_ndb_status_ok.require
 share/mysql-test/r/have_openssl.require
 share/mysql-test/r/have_outfile.require
 share/mysql-test/r/have_query_cache.require
@@ -283,6 +286,7 @@ share/mysql-test/r/have_symlink.require
 share/mysql-test/r/have_tis620.require
 share/mysql-test/r/have_ucs2.require
 share/mysql-test/r/have_udf.require
+share/mysql-test/r/have_udf_example.require
 share/mysql-test/r/have_ujis.require
 share/mysql-test/r/having.result
 share/mysql-test/r/heap.result
@@ -302,6 +306,7 @@ share/mysql-test/r/index_merge_innodb2.result
 share/mysql-test/r/index_merge_ror.result
 share/mysql-test/r/index_merge_ror_cpk.result
 share/mysql-test/r/information_schema.result
+share/mysql-test/r/information_schema_chmod.result
 share/mysql-test/r/information_schema_db.result
 share/mysql-test/r/information_schema_inno.result
 share/mysql-test/r/init_connect.result
@@ -367,6 +372,7 @@ share/mysql-test/r/ndb_alter_table.result
 share/mysql-test/r/ndb_alter_table2.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_bitfield.result
 share/mysql-test/r/ndb_blob.result
@@ -387,10 +393,12 @@ 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_read_multi_range.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
@@ -399,6 +407,7 @@ share/mysql-test/r/ndb_truncate.result
 share/mysql-test/r/ndb_types.result
 share/mysql-test/r/ndb_update.result
 share/mysql-test/r/negation_elimination.result
+share/mysql-test/r/not_as_root.require
 share/mysql-test/r/not_embedded.require
 share/mysql-test/r/not_embedded_server.result
 share/mysql-test/r/not_openssl.require
@@ -455,6 +464,7 @@ share/mysql-test/r/rpl000018.result
 share/mysql-test/r/rpl_EE_error.result
 share/mysql-test/r/rpl_alter.result
 share/mysql-test/r/rpl_auto_increment.result
+share/mysql-test/r/rpl_auto_increment_11932.result
 share/mysql-test/r/rpl_chain_temp_table.result
 share/mysql-test/r/rpl_change_master.result
 share/mysql-test/r/rpl_charset.result
@@ -621,6 +631,7 @@ share/mysql-test/r/xa.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/bug15328.cnf
 share/mysql-test/std_data/bug16266.000001
 share/mysql-test/std_data/cacert.pem
 share/mysql-test/std_data/client-cert.pem
@@ -643,6 +654,7 @@ share/mysql-test/std_data/rpl_timezone.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/untrusted-cacert.pem
 share/mysql-test/std_data/vchar.frm
 share/mysql-test/std_data/warnings_loaddata.dat
 share/mysql-test/std_data/words.dat
@@ -688,6 +700,7 @@ share/mysql-test/t/count_distinct2-master.opt
 share/mysql-test/t/count_distinct2.test
 share/mysql-test/t/count_distinct3.test
 share/mysql-test/t/create.test
+share/mysql-test/t/create_not_windows.test
 share/mysql-test/t/create_select_tmp.test
 share/mysql-test/t/csv.test
 share/mysql-test/t/ctype_big5.test
@@ -800,9 +813,11 @@ share/mysql-test/t/heap_hash.test
 share/mysql-test/t/help.test
 share/mysql-test/t/im_daemon_life_cycle-im.opt
 share/mysql-test/t/im_daemon_life_cycle.imtest
+share/mysql-test/t/im_life_cycle-im.opt
 share/mysql-test/t/im_life_cycle.imtest
 share/mysql-test/t/im_options_set.imtest
 share/mysql-test/t/im_options_unset.imtest
+share/mysql-test/t/im_utils-im.opt
 share/mysql-test/t/im_utils.imtest
 share/mysql-test/t/index_merge.test
 share/mysql-test/t/index_merge_bdb.test
@@ -811,6 +826,7 @@ share/mysql-test/t/index_merge_innodb2.test
 share/mysql-test/t/index_merge_ror.test
 share/mysql-test/t/index_merge_ror_cpk.test
 share/mysql-test/t/information_schema.test
+share/mysql-test/t/information_schema_chmod.test
 share/mysql-test/t/information_schema_db.test
 share/mysql-test/t/information_schema_inno.test
 share/mysql-test/t/init_connect-master.opt
@@ -876,6 +892,7 @@ 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.test
+share/mysql-test/t/mysql_client_test.opt
 share/mysql-test/t/mysql_client_test.test
 share/mysql-test/t/mysql_delimiter.sql
 share/mysql-test/t/mysql_delimiter_source.sql
@@ -893,6 +910,7 @@ share/mysql-test/t/ndb_alter_table2.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_bitfield.test
 share/mysql-test/t/ndb_blob.test
@@ -911,10 +929,12 @@ 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_read_multi_range.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
@@ -990,6 +1010,7 @@ share/mysql-test/t/rpl_EE_error.test
 share/mysql-test/t/rpl_alter.test
 share/mysql-test/t/rpl_auto_increment-master.opt
 share/mysql-test/t/rpl_auto_increment.test
+share/mysql-test/t/rpl_auto_increment_11932.test
 share/mysql-test/t/rpl_chain_temp_table.test
 share/mysql-test/t/rpl_change_master.test
 share/mysql-test/t/rpl_charset.test
@@ -1109,8 +1130,8 @@ share/mysql-test/t/rpl_until.test
 share/mysql-test/t/rpl_user_variables.test
 share/mysql-test/t/rpl_variables-master.opt
 share/mysql-test/t/rpl_variables.test
-share/mysql-test/t/rpl_view.test
 share/mysql-test/t/rpl_view-slave.opt
+share/mysql-test/t/rpl_view.test
 share/mysql-test/t/schema.test
 share/mysql-test/t/select.test
 share/mysql-test/t/select_found.test
@@ -1193,11 +1214,11 @@ share/mysql-test/t/user_limits.test
 share/mysql-test/t/user_var-binlog.test
 share/mysql-test/t/user_var.test
 share/mysql-test/t/varbinary.test
-share/mysql-test/t/variables-master.opt
 share/mysql-test/t/variables.test
 share/mysql-test/t/view.test
 share/mysql-test/t/view_grant.test
 share/mysql-test/t/view_query_cache.test
+share/mysql-test/t/wait_for_process.sh
 share/mysql-test/t/wait_timeout-master.opt
 share/mysql-test/t/wait_timeout.test
 share/mysql-test/t/warnings-master.opt
diff --git a/databases/mysql5-server/distinfo b/databases/mysql5-server/distinfo
index 4e037fcd76d..2cefcc45e4d 100644
--- a/databases/mysql5-server/distinfo
+++ b/databases/mysql5-server/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.9 2006/07/10 20:16:53 sketch Exp $
+$NetBSD: distinfo,v 1.10 2006/08/06 16:30:40 tron Exp $
 
-SHA1 (mysql-5.0.22.tar.gz) = b4310bfa838771f0b01e01cf9c1f789a3bbb4b76
-RMD160 (mysql-5.0.22.tar.gz) = 12aad812756b2a97a380bc504c514db15a997362
-Size (mysql-5.0.22.tar.gz) = 19542405 bytes
+SHA1 (mysql-5.0.24.tar.gz) = 03f4fbe5e6efaadcd468798daf147fadf7abbe52
+RMD160 (mysql-5.0.24.tar.gz) = a4ffe83969dd4781762a0f5b906f2f0ece5fdff5
+Size (mysql-5.0.24.tar.gz) = 19974920 bytes
 SHA1 (patch-aa) = fcd1222f9939070a45bbb8ddf72bb1bdadea1f8b
-SHA1 (patch-ab) = 56cd26b3eb125e7d9b7775c9e148118bbd3dc6b3
+SHA1 (patch-ab) = 3edc7889d3fec049104bd0aba7b9db1cdc4a83d6
 SHA1 (patch-ac) = e7b0216336a156bdd28a63b0316b9b4615d8efa7
 SHA1 (patch-ad) = 36fb22fa10f2d379decf8e6fc86fc966472930e2
 SHA1 (patch-ae) = adc6956d4be304db61aa0323061143fffc1b9751
-SHA1 (patch-af) = 33c7caa6fe6a61da2a60a63a058cfdbd85af1e2d
+SHA1 (patch-af) = cc38ae24173192d40b4be5820355da30d49292b3
 SHA1 (patch-ag) = 6ec3c6dd509f3a331728808972b9b0c1c57e3d32
 SHA1 (patch-ah) = 81a8cdd4f3ebea640ee5fa75ab8884c452ed3cd7
 SHA1 (patch-ai) = 725a3a6e06d39b26efb706bebbe3ff95da82be96
diff --git a/databases/mysql5-server/patches/patch-ab b/databases/mysql5-server/patches/patch-ab
index ffe8a4b2fd1..31ad74d2923 100644
--- a/databases/mysql5-server/patches/patch-ab
+++ b/databases/mysql5-server/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+$NetBSD: patch-ab,v 1.2 2006/08/06 16:30:40 tron Exp $
 
---- tests/Makefile.in.orig	2005-10-31 09:35:35.000000000 +0100
-+++ tests/Makefile.in	2005-10-31 09:36:29.000000000 +0100
-@@ -100,7 +100,7 @@
- am_mysql_client_test_OBJECTS = mysql_client_test.$(OBJEXT) \
- 	$(am__objects_1)
+--- tests/Makefile.in.orig	2006-07-27 19:53:37.000000000 +0100
++++ tests/Makefile.in	2006-08-06 16:03:47.000000000 +0100
+@@ -102,7 +102,7 @@
+ @HAVE_NETWARE_TRUE@	mysql_client_test.$(OBJEXT) \
+ @HAVE_NETWARE_TRUE@	$(am__objects_1) my_memmem.$(OBJEXT)
  mysql_client_test_OBJECTS = $(am_mysql_client_test_OBJECTS)
 -am__DEPENDENCIES_1 = $(top_builddir)/libmysql/libmysqlclient.la
 +am__DEPENDENCIES_1 =
  am__DEPENDENCIES_2 =
- mysql_client_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_2)
-@@ -112,7 +112,7 @@
+ @HAVE_NETWARE_FALSE@mysql_client_test_DEPENDENCIES =  \
+ @HAVE_NETWARE_FALSE@	$(am__DEPENDENCIES_1) \
+@@ -117,7 +117,7 @@
  thread_test_SOURCES = thread_test.c
  thread_test_OBJECTS = thread_test.$(OBJEXT)
  thread_test_LDADD = $(LDADD)
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
-@@ -412,8 +412,7 @@
+@@ -420,8 +420,7 @@
  INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
  			$(openssl_includes)
  
@@ -28,5 +28,5 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
 -                        $(top_builddir)/libmysql/libmysqlclient.la
 +LDADD = @CLIENT_EXTRA_LDFLAGS@ -lmysqlclient
  
- mysql_client_test_LDADD = $(LDADD) $(CXXLDFLAGS)
- mysql_client_test_SOURCES = mysql_client_test.c $(yassl_dummy_link_fix)
+ @HAVE_NETWARE_FALSE@mysql_client_test_LDADD = $(LDADD) $(CXXLDFLAGS) -L../mysys -lmysys
+ @HAVE_NETWARE_TRUE@mysql_client_test_LDADD = $(LDADD) $(CXXLDFLAGS)
diff --git a/databases/mysql5-server/patches/patch-af b/databases/mysql5-server/patches/patch-af
index de1c806a75d..80067a7bb2b 100644
--- a/databases/mysql5-server/patches/patch-af
+++ b/databases/mysql5-server/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+$NetBSD: patch-af,v 1.2 2006/08/06 16:30:40 tron Exp $
 
---- configure.orig	2005-10-31 09:38:34.000000000 +0100
-+++ configure	2005-10-31 09:40:09.000000000 +0100
-@@ -21984,7 +21984,7 @@
+--- configure.orig	2006-07-27 19:53:44.000000000 +0100
++++ configure	2006-08-06 16:53:36.000000000 +0100
+@@ -21500,7 +21500,7 @@
    FIND_PROC="$PS \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
  else
    case $SYSTEM_TYPE in
@@ -11,7 +11,33 @@ $NetBSD: patch-af,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
        FIND_PROC="$PS p \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
        ;;
      *darwin*)
-@@ -26258,6 +26258,10 @@
+@@ -24458,13 +24458,13 @@
+   :
+ else
+ 
+-echo "$as_me:$LINENO: checking for sem_init in -lposix4" >&5
+-echo $ECHO_N "checking for sem_init in -lposix4... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for sem_init in -lrt" >&5
++echo $ECHO_N "checking for sem_init in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_posix4_sem_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lposix4  $LIBS"
++LIBS="-lrt  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24527,7 +24527,7 @@
+ #define HAVE_LIBPOSIX4 1
+ _ACEOF
+ 
+-  LIBS="-lposix4 $LIBS"
++  LIBS="-lrt $LIBS"
+ 
+ fi
+ 
+@@ -25792,6 +25792,10 @@
        MAX_C_OPTIMIZE="-O"
      fi
      ;;
@@ -22,7 +48,18 @@ $NetBSD: patch-af,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
    *freebsd*)
      { echo "$as_me:$LINENO: WARNING: Adding fix for interrupted reads" >&5
  echo "$as_me: WARNING: Adding fix for interrupted reads" >&2;}
-@@ -39729,7 +39733,7 @@
+@@ -39038,8 +39042,8 @@
+         OPENSSL_INCLUDE=-I$incs
+       fi
+       # Test for libssl using all known library file endings
+-      if test -f $d/libssl.a || test -f $d/libssl.so || \
+-         test -f $d/libssl.sl || test -f $d/libssl.dylib ; then
++      if test -f $libs/libssl.a || test -f $libs/libssl.so || \
++         test -f $libs/libssl.sl || test -f $libs/libssl.dylib ; then
+         OPENSSL_LIB=$libs
+       fi
+       ;;
+@@ -39377,7 +39381,7 @@
  main ()
  {
  
@@ -31,3 +68,12 @@ $NetBSD: patch-af,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
  		completion_matches(0,0);
  
    ;
+@@ -41815,6 +41819,8 @@
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++	: Avoid regenerating within pkgsrc
++	exit 0
+     ac_cs_recheck=: ;;
+   --version | --vers* | -V )
+     echo "$ac_cs_version"; exit 0 ;;