Changes 5.0.37:

* Added the SHOW PROFILES and SHOW PROFILE statements to display statement
  profile data, and the accompanying INFORMATION_SCHEMA.PROFILING table.

* Added the Uptime_since_flush_status status variable, which indicates the
  number of seconds since the most recent FLUSH STATUS statement.

* Incompatible change in DATE_FORMAT().

* NDB Cluster: The LockPagesInMainMemory configuration parameter has changed
  its type and possible values.

* The bundled yaSSL library was upgraded to version 1.5.8.

* The --skip-thread-priority option now is enabled by default for binary Mac
  OS X distributions. Use of thread priorities degrades performance on Mac OS X.

* Added the --disable-grant-options option to configure.

* Bug fixes.

21 files changed, 95 insertions, 101 deletions

diff --git a/databases/mysql5-client/patches/patch-ab b/databases/mysql5-client/patches/patch-ab
index 43a4d4ea843..446170613e3 100644
--- a/databases/mysql5-client/patches/patch-ab
+++ b/databases/mysql5-client/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
+$NetBSD: patch-ab,v 1.2 2007/03/11 18:42:28 adam Exp $
 
---- sql/mysqld.cc.orig	2005-10-14 10:21:12.000000000 +0000
+--- sql/mysqld.cc.orig	2007-03-05 20:21:11.000000000 +0100
 +++ sql/mysqld.cc
-@@ -182,7 +182,7 @@ static void getvolumeID(BYTE *volumeName
+@@ -171,7 +171,7 @@ static void getvolumeID(BYTE *volumeName
  int initgroups(const char *,unsigned int);
  #endif
  
diff --git a/databases/mysql5-client/patches/patch-ac b/databases/mysql5-client/patches/patch-ac
index 4684d1221a7..416f708312b 100644
--- a/databases/mysql5-client/patches/patch-ac
+++ b/databases/mysql5-client/patches/patch-ac
@@ -1,10 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2006/10/14 18:41:34 xtraeme Exp $
+$NetBSD: patch-ac,v 1.4 2007/03/11 18:42:28 adam Exp $
 
-Patch reported: http://bugs.mysql.com/bug.php?id=23294&thanks=4
-
---- configure.in.orig	2006-10-14 18:56:35.000000000 +0200
-+++ configure.in	2006-10-14 18:58:41.000000000 +0200
-@@ -475,7 +475,7 @@
+--- configure.in.orig	2007-03-05 20:21:13.000000000 +0100
++++ configure.in
+@@ -487,7 +487,7 @@ then
    FIND_PROC="$PS \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
  else
    case $SYSTEM_TYPE in
@@ -13,7 +11,7 @@ Patch reported: http://bugs.mysql.com/bug.php?id=23294&thanks=4
        FIND_PROC="$PS p \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
        ;;
      *darwin*)
-@@ -752,6 +752,8 @@
+@@ -794,6 +794,8 @@ AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(H
  
  # For sem_xxx functions on Solaris 2.6
  AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init))
@@ -22,7 +20,7 @@ Patch reported: http://bugs.mysql.com/bug.php?id=23294&thanks=4
  MYSQL_CHECK_ZLIB_WITH_COMPRESS
  
  # For large pages support
-@@ -1077,7 +1079,7 @@
+@@ -1119,7 +1121,7 @@ case $SYSTEM_TYPE in
        MAX_C_OPTIMIZE="-O"
      fi
      ;;
diff --git a/databases/mysql5-client/patches/patch-ad b/databases/mysql5-client/patches/patch-ad
index 5987535bc13..ac95931cbbe 100644
--- a/databases/mysql5-client/patches/patch-ad
+++ b/databases/mysql5-client/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2006/10/15 08:58:15 salo Exp $
+$NetBSD: patch-ad,v 1.5 2007/03/11 18:42:28 adam Exp $
 
---- Makefile.in.orig	2006-10-14 18:55:43.000000000 +0200
-+++ Makefile.in	2006-10-14 18:55:59.000000000 +0200
-@@ -370,12 +370,7 @@
+--- Makefile.in.orig	2007-03-05 20:23:25.000000000 +0100
++++ Makefile.in
+@@ -372,12 +372,7 @@ AUTOMAKE_OPTIONS = foreign
  EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
  			README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
  
diff --git a/databases/mysql5-client/patches/patch-ae b/databases/mysql5-client/patches/patch-ae
index 4dad72cff0b..20426b0046e 100644
--- a/databases/mysql5-client/patches/patch-ae
+++ b/databases/mysql5-client/patches/patch-ae
@@ -1,10 +1,8 @@
-$NetBSD: patch-ae,v 1.6 2006/08/06 16:30:40 tron Exp $
+$NetBSD: patch-ae,v 1.7 2007/03/11 18:42:28 adam Exp $
 
-Don't install scripts handled by mysql-server.
-
---- 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 @@
+--- scripts/Makefile.in.orig	2007-03-05 20:23:19.000000000 +0100
++++ scripts/Makefile.in
+@@ -355,13 +355,12 @@ yassl_h_ln_cmd = @yassl_h_ln_cmd@
  yassl_libs = @yassl_libs@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
@@ -19,7 +17,7 @@ Don't install scripts handled by mysql-server.
  			mysql_zap \
  			mysqlaccess \
  			mysqlbug \
-@@ -368,7 +367,6 @@
+@@ -372,7 +371,6 @@ bin_SCRIPTS = @server_scripts@ \
  			mysql_explain_log \
  			mysql_tableinfo \
  			mysql_upgrade_shell \
diff --git a/databases/mysql5-client/patches/patch-af b/databases/mysql5-client/patches/patch-af
index 749f96118a8..ba726f27c6e 100644
--- a/databases/mysql5-client/patches/patch-af
+++ b/databases/mysql5-client/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.5 2006/10/14 18:41:34 xtraeme Exp $
+$NetBSD: patch-af,v 1.6 2007/03/11 18:42:28 adam Exp $
 
---- man/Makefile.in.orig	2006-10-04 13:25:43.000000000 +0200
-+++ man/Makefile.in	2006-10-14 19:20:57.000000000 +0200
-@@ -344,8 +344,9 @@
+--- man/Makefile.in.orig	2007-03-05 20:22:54.000000000 +0100
++++ man/Makefile.in
+@@ -348,8 +348,9 @@ yassl_h_ln_cmd = @yassl_h_ln_cmd@
  yassl_libs = @yassl_libs@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
diff --git a/databases/mysql5-client/patches/patch-ag b/databases/mysql5-client/patches/patch-ag
index 8942c73a25a..f2897508fbc 100644
--- a/databases/mysql5-client/patches/patch-ag
+++ b/databases/mysql5-client/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.2 2006/05/18 16:11:15 cube Exp $
+$NetBSD: patch-ag,v 1.3 2007/03/11 18:42:28 adam Exp $
 
---- strings/Makefile.in.orig	2006-04-26 20:32:24.000000000 +0200
+--- strings/Makefile.in.orig	2007-03-05 20:23:22.000000000 +0100
 +++ strings/Makefile.in
-@@ -609,7 +609,6 @@ install-pkglibLIBRARIES: $(pkglib_LIBRAR
+@@ -616,7 +616,6 @@ install-pkglibLIBRARIES: $(pkglib_LIBRAR
  	  if test -f $$p; then \
  	    f=$(am__strip_dir) \
  	    echo " $(pkglibLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
@@ -10,7 +10,7 @@ $NetBSD: patch-ag,v 1.2 2006/05/18 16:11:15 cube Exp $
  	  else :; fi; \
  	done
  	@$(POST_INSTALL)
-@@ -617,7 +616,6 @@ install-pkglibLIBRARIES: $(pkglib_LIBRAR
+@@ -624,7 +623,6 @@ install-pkglibLIBRARIES: $(pkglib_LIBRAR
  	  if test -f $$p; then \
  	    p=$(am__strip_dir) \
  	    echo " $(RANLIB) '$(DESTDIR)$(pkglibdir)/$$p'"; \
@@ -18,7 +18,7 @@ $NetBSD: patch-ag,v 1.2 2006/05/18 16:11:15 cube Exp $
  	  else :; fi; \
  	done
  
-@@ -626,7 +624,6 @@ uninstall-pkglibLIBRARIES:
+@@ -633,7 +631,6 @@ uninstall-pkglibLIBRARIES:
  	@list='$(pkglib_LIBRARIES)'; for p in $$list; do \
  	  p=$(am__strip_dir) \
  	  echo " rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
diff --git a/databases/mysql5-client/patches/patch-ah b/databases/mysql5-client/patches/patch-ah
index 8eb669d0db3..e8a8a55ec0b 100644
--- a/databases/mysql5-client/patches/patch-ah
+++ b/databases/mysql5-client/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.3 2006/10/28 07:45:51 schwarz Exp $
+$NetBSD: patch-ah,v 1.4 2007/03/11 18:42:28 adam Exp $
 
---- include/my_net.h.orig	2006-10-23 21:21:16.000000000 +0200
-+++ include/my_net.h	2006-10-23 21:24:11.000000000 +0200
-@@ -71,6 +71,15 @@
+--- include/my_net.h.orig	2007-03-05 20:21:13.000000000 +0100
++++ include/my_net.h
+@@ -70,6 +70,15 @@ C_MODE_START
  
  #endif
  
diff --git a/databases/mysql5-client/patches/patch-ai b/databases/mysql5-client/patches/patch-ai
index f8031132936..02bb1cf96b9 100644
--- a/databases/mysql5-client/patches/patch-ai
+++ b/databases/mysql5-client/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
+$NetBSD: patch-ai,v 1.2 2007/03/11 18:42:28 adam Exp $
 
---- client/completion_hash.cc.orig	2005-02-18 01:38:24.000000000 +0100
-+++ client/completion_hash.cc	2005-02-18 01:38:47.000000000 +0100
-@@ -23,6 +23,10 @@
+--- client/completion_hash.cc.orig	2007-03-05 20:21:39.000000000 +0100
++++ client/completion_hash.cc
+@@ -22,6 +22,10 @@
  
  #include <my_global.h>
  #include <m_string.h>
diff --git a/databases/mysql5-client/patches/patch-aj b/databases/mysql5-client/patches/patch-aj
index 11ced7f7eb8..2c7bfd0df27 100644
--- a/databases/mysql5-client/patches/patch-aj
+++ b/databases/mysql5-client/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
+$NetBSD: patch-aj,v 1.2 2007/03/11 18:42:28 adam Exp $
 
---- client/mysqladmin.cc.orig	2005-02-18 01:39:09.000000000 +0100
-+++ client/mysqladmin.cc	2005-02-18 01:40:21.000000000 +0100
-@@ -326,8 +326,14 @@
+--- client/mysqladmin.cc.orig	2007-03-05 20:21:42.000000000 +0100
++++ client/mysqladmin.cc
+@@ -325,8 +325,14 @@ int main(int argc,char *argv[])
    if (tty_password)
      opt_password = get_tty_password(NullS);
  
diff --git a/databases/mysql5-client/patches/patch-ak b/databases/mysql5-client/patches/patch-ak
index fbaf8e1d64d..c2342d538b2 100644
--- a/databases/mysql5-client/patches/patch-ak
+++ b/databases/mysql5-client/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.1 2005/12/02 08:13:26 xtraeme Exp $
+$NetBSD: patch-ak,v 1.2 2007/03/11 18:42:28 adam Exp $
 
---- mysys/Makefile.in.orig	2005-12-02 08:52:03.000000000 +0100
-+++ mysys/Makefile.in	2005-12-02 08:52:12.000000000 +0100
-@@ -473,7 +473,7 @@
+--- mysys/Makefile.in.orig	2007-03-05 20:22:57.000000000 +0100
++++ mysys/Makefile.in
+@@ -428,7 +428,7 @@ MYSQLBASEdir = $(prefix)
  INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \
  			-I$(top_srcdir)/include -I$(srcdir)
  
diff --git a/databases/mysql5-client/patches/patch-al b/databases/mysql5-client/patches/patch-al
index cb43f773d12..79e04eb77dc 100644
--- a/databases/mysql5-client/patches/patch-al
+++ b/databases/mysql5-client/patches/patch-al
@@ -1,14 +1,12 @@
-$NetBSD: patch-al,v 1.1 2006/01/08 17:45:23 xtraeme Exp $
+$NetBSD: patch-al,v 1.2 2007/03/11 18:42:28 adam Exp $
 
---- include/Makefile.in.orig	2006-01-08 18:09:19.000000000 +0100
-+++ include/Makefile.in	2006-01-08 18:11:16.000000000 +0100
-@@ -349,7 +349,8 @@
- 			errmsg.h my_global.h my_net.h my_alloc.h \
- 			my_getopt.h sslopt-longopts.h my_dir.h typelib.h \
- 			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
--			mysql_time.h $(BUILT_SOURCES)
-+			mysql_time.h $(BUILT_SOURCES) mysqld_ername.h \
-+			mysqld_error.h sql_state.h
+--- include/Makefile.in.orig	2007-03-11 09:24:33.000000000 +0100
++++ include/Makefile.in
+@@ -360,6 +360,7 @@ zlib_dir = @zlib_dir@
+ BUILT_SOURCES = $(HEADERS_GEN) abi_check
+ HEADERS_GEN = mysql_version.h my_config.h
+ HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \
++		mysqld_ername.h mysqld_error.h sql_state.h \
+ 			my_list.h my_alloc.h typelib.h
  
- noinst_HEADERS = config-win.h config-os2.h config-netware.h \
- 			heap.h my_bitmap.h\
+ pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \
diff --git a/databases/mysql5-client/patches/patch-am b/databases/mysql5-client/patches/patch-am
index 474c7304c31..60b6c36d8f0 100644
--- a/databases/mysql5-client/patches/patch-am
+++ b/databases/mysql5-client/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.1 2006/10/28 07:45:51 schwarz Exp $
+$NetBSD: patch-am,v 1.2 2007/03/11 18:42:28 adam Exp $
 
---- sql/sql_string.cc.orig	2006-10-23 23:22:28.000000000 +0200
-+++ sql/sql_string.cc	2006-10-23 23:24:07.000000000 +0200
-@@ -38,6 +38,10 @@
+--- sql/sql_string.cc.orig	2007-03-05 20:21:11.000000000 +0100
++++ sql/sql_string.cc
+@@ -37,6 +37,10 @@ extern void sql_element_free(void *ptr);
  
  #include "sql_string.h"
  
diff --git a/databases/mysql5-client/patches/patch-an b/databases/mysql5-client/patches/patch-an
index 07751694a25..437760246f4 100644
--- a/databases/mysql5-client/patches/patch-an
+++ b/databases/mysql5-client/patches/patch-an
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.1 2006/10/28 07:45:51 schwarz Exp $
+$NetBSD: patch-an,v 1.2 2007/03/11 18:42:28 adam Exp $
 
---- client/sql_string.cc.orig	2006-10-23 23:26:59.000000000 +0200
-+++ client/sql_string.cc	2006-10-23 23:27:27.000000000 +0200
-@@ -38,6 +38,10 @@
+--- client/sql_string.cc.orig	2007-03-05 20:21:11.000000000 +0100
++++ client/sql_string.cc
+@@ -37,6 +37,10 @@ extern void sql_element_free(void *ptr);
  
  #include "sql_string.h"
  
diff --git a/databases/mysql5-client/patches/patch-ao b/databases/mysql5-client/patches/patch-ao
index 73ef59e5ce6..00704f2bc4a 100644
--- a/databases/mysql5-client/patches/patch-ao
+++ b/databases/mysql5-client/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.1 2006/10/28 07:45:51 schwarz Exp $
+$NetBSD: patch-ao,v 1.2 2007/03/11 18:42:28 adam Exp $
 
---- libmysqld/sql_string.cc.orig	2006-10-23 23:29:34.000000000 +0200
-+++ libmysqld/sql_string.cc	2006-10-23 23:29:54.000000000 +0200
-@@ -38,6 +38,10 @@
+--- libmysqld/sql_string.cc.orig	2007-03-05 20:21:11.000000000 +0100
++++ libmysqld/sql_string.cc
+@@ -37,6 +37,10 @@ extern void sql_element_free(void *ptr);
  
  #include "sql_string.h"
  
diff --git a/databases/mysql5-client/patches/patch-ap b/databases/mysql5-client/patches/patch-ap
index 693bb99fe16..91de78e00ab 100644
--- a/databases/mysql5-client/patches/patch-ap
+++ b/databases/mysql5-client/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.1 2006/10/28 07:45:51 schwarz Exp $
+$NetBSD: patch-ap,v 1.2 2007/03/11 18:42:28 adam Exp $
 
---- client/mysqlbinlog.cc.orig	2006-10-23 23:42:07.000000000 +0200
-+++ client/mysqlbinlog.cc	2006-10-23 23:42:55.000000000 +0200
-@@ -37,6 +37,9 @@
+--- client/mysqlbinlog.cc.orig	2007-03-05 20:21:42.000000000 +0100
++++ client/mysqlbinlog.cc
+@@ -36,6 +36,9 @@
  #include "mysql_priv.h" 
  #include "log_event.h"
  #include "sql_common.h"
diff --git a/databases/mysql5-client/patches/patch-aq b/databases/mysql5-client/patches/patch-aq
index f0662ac791c..a76e3933d70 100644
--- a/databases/mysql5-client/patches/patch-aq
+++ b/databases/mysql5-client/patches/patch-aq
@@ -1,8 +1,8 @@
-$NetBSD: patch-aq,v 1.1 2006/10/28 07:45:51 schwarz Exp $
+$NetBSD: patch-aq,v 1.2 2007/03/11 18:42:28 adam Exp $
 
---- strings/decimal.c.orig	2006-10-23 23:45:14.000000000 +0200
-+++ strings/decimal.c	2006-10-23 23:45:46.000000000 +0200
-@@ -106,6 +106,9 @@
+--- strings/decimal.c.orig	2007-03-05 20:21:12.000000000 +0100
++++ strings/decimal.c
+@@ -105,6 +105,9 @@
  #include <my_sys.h> /* for my_alloca */
  #include <m_string.h>
  #include <decimal.h>
diff --git a/databases/mysql5-client/patches/patch-ar b/databases/mysql5-client/patches/patch-ar
index 1ad34ceb605..3969fcb9239 100644
--- a/databases/mysql5-client/patches/patch-ar
+++ b/databases/mysql5-client/patches/patch-ar
@@ -1,8 +1,8 @@
-$NetBSD: patch-ar,v 1.1 2006/10/28 07:45:51 schwarz Exp $
+$NetBSD: patch-ar,v 1.2 2007/03/11 18:42:28 adam Exp $
 
---- sql/log_event.cc.orig	2006-10-23 23:49:26.000000000 +0200
-+++ sql/log_event.cc	2006-10-23 23:50:20.000000000 +0200
-@@ -24,6 +24,9 @@
+--- sql/log_event.cc.orig	2007-03-05 20:21:39.000000000 +0100
++++ sql/log_event.cc
+@@ -23,6 +23,9 @@
  #include  "mysql_priv.h"
  #include "slave.h"
  #include <my_dir.h>
diff --git a/databases/mysql5-client/patches/patch-as b/databases/mysql5-client/patches/patch-as
index edba7011826..78d4681446e 100644
--- a/databases/mysql5-client/patches/patch-as
+++ b/databases/mysql5-client/patches/patch-as
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.1 2006/10/28 07:45:51 schwarz Exp $
+$NetBSD: patch-as,v 1.2 2007/03/11 18:42:29 adam Exp $
 
---- libmysqld/log_event.cc.orig	2006-10-23 23:52:01.000000000 +0200
-+++ libmysqld/log_event.cc	2006-10-23 23:52:30.000000000 +0200
-@@ -24,6 +24,9 @@
+--- libmysqld/log_event.cc.orig	2007-03-05 20:21:39.000000000 +0100
++++ libmysqld/log_event.cc
+@@ -23,6 +23,9 @@
  #include  "mysql_priv.h"
  #include "slave.h"
  #include <my_dir.h>
diff --git a/databases/mysql5-client/patches/patch-at b/databases/mysql5-client/patches/patch-at
index 0fd2f6292fb..6185810fadd 100644
--- a/databases/mysql5-client/patches/patch-at
+++ b/databases/mysql5-client/patches/patch-at
@@ -1,8 +1,8 @@
-$NetBSD: patch-at,v 1.1 2006/10/28 07:45:51 schwarz Exp $
+$NetBSD: patch-at,v 1.2 2007/03/11 18:42:29 adam Exp $
 
---- sql/log_event.h.orig	2006-10-24 00:00:12.000000000 +0200
-+++ sql/log_event.h	2006-10-24 00:00:43.000000000 +0200
-@@ -18,6 +18,10 @@
+--- sql/log_event.h.orig	2007-03-05 20:21:40.000000000 +0100
++++ sql/log_event.h
+@@ -17,6 +17,10 @@
  #ifndef _log_event_h
  #define _log_event_h
  
diff --git a/databases/mysql5-client/patches/patch-au b/databases/mysql5-client/patches/patch-au
index c0c31abbefe..d3f831b0cb7 100644
--- a/databases/mysql5-client/patches/patch-au
+++ b/databases/mysql5-client/patches/patch-au
@@ -1,8 +1,8 @@
-$NetBSD: patch-au,v 1.1 2006/10/28 07:45:51 schwarz Exp $
+$NetBSD: patch-au,v 1.2 2007/03/11 18:42:29 adam Exp $
 
---- client/mysql.cc.orig	Tue Oct 24 00:24:08 2006
-+++ client/mysql.cc	Mon Oct 23 23:11:25 2006
-@@ -38,7 +38,15 @@
+--- client/mysql.cc.orig	2007-03-05 20:21:21.000000000 +0100
++++ client/mysql.cc
+@@ -37,7 +37,15 @@
  #endif
  #include "my_readline.h"
  #include <signal.h>
@@ -18,7 +18,7 @@ $NetBSD: patch-au,v 1.1 2006/10/28 07:45:51 schwarz Exp $
  
  #if defined(USE_LIBEDIT_INTERFACE) && defined(HAVE_LOCALE_H)
  #include <locale.h>
-@@ -420,10 +428,10 @@
+@@ -438,10 +446,10 @@ int main(int argc,char *argv[])
      ignore_errors=1;				// Don't abort monitor
  
    if (opt_sigint_ignore)
@@ -32,7 +32,7 @@ $NetBSD: patch-au,v 1.1 2006/10/28 07:45:51 schwarz Exp $
  
    /*
      Run in interactive mode like the ingres/postgres monitor
-@@ -495,7 +503,7 @@
+@@ -513,7 +521,7 @@ sig_handler mysql_sigint(int sig)
    char kill_buffer[40];
    MYSQL *kill_mysql= NULL;
  
diff --git a/databases/mysql5-client/patches/patch-bf b/databases/mysql5-client/patches/patch-bf
index d7c162f7bd5..3a4d3a98d97 100644
--- a/databases/mysql5-client/patches/patch-bf
+++ b/databases/mysql5-client/patches/patch-bf
@@ -1,8 +1,8 @@
-$NetBSD: patch-bf,v 1.1 2006/10/08 13:30:59 rillig Exp $
+$NetBSD: patch-bf,v 1.2 2007/03/11 18:42:29 adam Exp $
 
---- bdb/dist/configure.orig	2006-10-08 15:25:31.000000000 +0200
-+++ bdb/dist/configure	2006-10-08 15:26:39.000000000 +0200
-@@ -5038,7 +5038,7 @@ fi
+--- bdb/dist/configure.orig	2007-03-05 20:23:33.000000000 +0100
++++ bdb/dist/configure
+@@ -5039,7 +5039,7 @@ fi
  # we're using.
  case "$host_os" in
  sysv5UnixWare*|sysv5OpenUNIX8*)