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

2 files changed, 49 insertions, 12 deletions

diff --git a/databases/mysql5-client/patches/patch-ac b/databases/mysql5-client/patches/patch-ac
index 920e18babc2..c3ddb0a01ca 100644
--- a/databases/mysql5-client/patches/patch-ac
+++ b/databases/mysql5-client/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
+$NetBSD: patch-ac,v 1.2 2006/08/06 16:30:40 tron Exp $
 
---- configure.orig	2005-10-17 03:29:33.000000000 +0200
-+++ configure	2005-10-31 09:16:17.000000000 +0100
-@@ -21984,7 +21984,7 @@
+--- configure.orig	2006-07-27 19:53:44.000000000 +0100
++++ configure	2006-08-06 15:34:25.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-ac,v 1.1.1.1 2005/10/31 09:21:40 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-ac,v 1.1.1.1 2005/10/31 09:21:40 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 ()
  {
  
diff --git a/databases/mysql5-client/patches/patch-ae b/databases/mysql5-client/patches/patch-ae
index 0272e2ef7de..4dad72cff0b 100644
--- a/databases/mysql5-client/patches/patch-ae
+++ b/databases/mysql5-client/patches/patch-ae
@@ -1,10 +1,10 @@
-$NetBSD: patch-ae,v 1.5 2006/05/18 16:11:15 cube Exp $
+$NetBSD: patch-ae,v 1.6 2006/08/06 16:30:40 tron Exp $
 
 Don't install scripts handled by mysql-server.
 
---- scripts/Makefile.in.orig	2006-04-26 20:32:21.000000000 +0200
-+++ scripts/Makefile.in
-@@ -351,13 +351,12 @@ yassl_includes = @yassl_includes@
+--- scripts/Makefile.in.orig	2006-07-27 19:53:32.000000000 +0100
++++ scripts/Makefile.in	2006-08-06 15:11:56.000000000 +0100
+@@ -351,13 +351,12 @@
  yassl_libs = @yassl_libs@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
@@ -19,10 +19,10 @@ Don't install scripts handled by mysql-server.
  			mysql_zap \
  			mysqlaccess \
  			mysqlbug \
-@@ -368,7 +367,6 @@ bin_SCRIPTS = @server_scripts@ \
+@@ -368,7 +367,6 @@
  			mysql_explain_log \
  			mysql_tableinfo \
- 			mysql_upgrade \
+ 			mysql_upgrade_shell \
 -			mysqld_multi \
  			mysql_create_system_tables