Importing mysql51-server 5.1.44, server part of MySQL 5.1.44 including

embedded server (by PKG_OPTION).

For release MySQL 5.1 specific information please refer:

	http://dev.mysql.com/doc/refman/5.1/en/mysql-nutshell.html


MySQL is a SQL (Structured Query Language) database server.  SQL is the
most popular database language in the world.  MySQL is a client-server
implementation that consists of a server daemon `mysqld' and many
different client programs/libraries.

The main goals of MySQL are speed and robustness.

The base upon which MySQL is built is a set of routines that have been
used in a highly demanding production environment for many years.  While
MySQL is still in development it already offers a rich and highly useful
function set.

The official way to pronounce 'MySQL' is 'My Ess Que Ell' (Not MY-SEQUEL).

This package contains the MySQL server programs and libraries including
embedded server (by PKG_OPTION).

21 files changed, 378 insertions, 0 deletions

diff --git a/databases/mysql51-server/patches/patch-aa b/databases/mysql51-server/patches/patch-aa
new file mode 100644
index 00000000000..b3de1993ab4
--- /dev/null
+++ b/databases/mysql51-server/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $
+
+--- BUILD/compile-pentium-gcov.orig	2010-02-04 11:36:48.000000000 +0000
++++ BUILD/compile-pentium-gcov
+@@ -7,7 +7,7 @@ CCACHE_GCOV_VERSION_ENABLED=0
+ if ccache -V > /dev/null 2>&1
+ then
+   CCACHE_VER=`ccache -V | head -1 | sed s/"ccache version "//`
+-  if test "$CCACHE_VER" == "2.4-gcov"
++  if test "$CCACHE_VER" = "2.4-gcov"
+   then
+     CCACHE_GCOV_VERSION_ENABLED=1
+   else
diff --git a/databases/mysql51-server/patches/patch-ab b/databases/mysql51-server/patches/patch-ab
new file mode 100644
index 00000000000..757d6430168
--- /dev/null
+++ b/databases/mysql51-server/patches/patch-ab
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $
+
+--- Makefile.in.orig	2010-02-04 11:46:48.000000000 +0000
++++ Makefile.in
+@@ -407,14 +407,10 @@ AUTOMAKE_OPTIONS = foreign
+ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
+ 			README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
+ 
+-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
+-			@readline_topdir@ sql-common scripts \
+-			@pstack_dir@ \
+-			@sql_union_dirs@ unittest \
+-			@sql_server@ @man_dirs@ tests \
+-			netware @libmysqld_dirs@ \
+-			mysql-test support-files sql-bench @tools_dirs@ \
+-			win
++SUBDIRS = . include scripts @pstack_dir@ \
++			strings mysys dbug extra regex storage plugin \
++			libmysql @sql_server@ @man_dirs@ tests \
++			@libmysqld_dirs@ mysql-test support-files
+ 
+ DIST_SUBDIRS = . include Docs zlib \
+ 			cmd-line-utils sql-common scripts \
diff --git a/databases/mysql51-server/patches/patch-ac b/databases/mysql51-server/patches/patch-ac
new file mode 100644
index 00000000000..d56e1d35535
--- /dev/null
+++ b/databases/mysql51-server/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $
+
+--- config/ac-macros/readline.m4.orig	2010-02-04 11:36:58.000000000 +0000
++++ config/ac-macros/readline.m4
+@@ -26,7 +26,7 @@ AC_DEFUN([MYSQL_CHECK_LIBEDIT_INTERFACE]
+ 		#include "readline/readline.h"
+ 	    ],
+ 	    [ 
+-		char res= *(*rl_completion_entry_function)(0,0);
++		char res= (*rl_completion_entry_function)(0,0);
+ 		completion_matches(0,0);
+ 	    ],
+ 	    [
diff --git a/databases/mysql51-server/patches/patch-ad b/databases/mysql51-server/patches/patch-ad
new file mode 100644
index 00000000000..581d79c18c7
--- /dev/null
+++ b/databases/mysql51-server/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $
+
+--- config/ac-macros/ssl.m4.orig	2010-02-04 11:36:58.000000000 +0000
++++ config/ac-macros/ssl.m4
+@@ -105,7 +105,7 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [
+   openssl_libs="-L$location/lib/ -lssl -lcrypto"
+   MYSQL_CHECK_SSL_DIR([$openssl_includes], [$openssl_libs])
+ 
+-  if test "$mysql_ssl_found" == "no"
++  if test "$mysql_ssl_found" = "no"
+   then
+     #
+     # BUG 764: Compile failure with OpenSSL on Red Hat Linux (krb5.h missing)
+@@ -115,7 +115,7 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [
+     MYSQL_CHECK_SSL_DIR([$openssl_includes], [$openssl_libs])
+   fi
+ 
+-  if test "$mysql_ssl_found" == "no"
++  if test "$mysql_ssl_found" = "no"
+   then
+     AC_MSG_ERROR([Could not link with SSL libs at $location])
+   fi
diff --git a/databases/mysql51-server/patches/patch-ae b/databases/mysql51-server/patches/patch-ae
new file mode 100644
index 00000000000..f12aa2585a6
--- /dev/null
+++ b/databases/mysql51-server/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $
+
+--- configure.in.orig	2010-02-04 11:36:59.000000000 +0000
++++ configure.in
+@@ -2023,7 +2023,7 @@ AC_CHECK_HEADERS(varargs.h stdarg.h dire
+ paths.h semaphore.h)
+ 
+ # Already-done: strcasecmp
+-AC_CHECK_FUNCS(lstat putenv select setenv setlocale strcoll tcgetattr)
++AC_CHECK_FUNCS(lstat putenv select setenv setlocale sigsend strcoll tcgetattr)
+ 
+ AC_STAT_MACROS_BROKEN
+ MYSQL_SIGNAL_CHECK
diff --git a/databases/mysql51-server/patches/patch-af b/databases/mysql51-server/patches/patch-af
new file mode 100644
index 00000000000..43aeb906cef
--- /dev/null
+++ b/databases/mysql51-server/patches/patch-af
@@ -0,0 +1,15 @@
+$NetBSD: patch-af,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $
+
+--- extra/Makefile.in.orig	2010-02-04 11:46:15.000000000 +0000
++++ extra/Makefile.in
+@@ -476,9 +476,7 @@ LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/
+ 			../dbug/libdbug.a ../strings/libmystrings.a \
+ 			$(ZLIB_LIBS)
+ 
+-BUILT_SOURCES = $(top_builddir)/include/mysqld_error.h \
+-                        $(top_builddir)/include/sql_state.h \
+-                        $(top_builddir)/include/mysqld_ername.h
++BUILT_SOURCES =
+ 
+ pkginclude_HEADERS = $(BUILT_SOURCES)
+ DISTCLEANFILES = $(BUILT_SOURCES)
diff --git a/databases/mysql51-server/patches/patch-ag b/databases/mysql51-server/patches/patch-ag
new file mode 100644
index 00000000000..7869c854148
--- /dev/null
+++ b/databases/mysql51-server/patches/patch-ag
@@ -0,0 +1,20 @@
+$NetBSD: patch-ag,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $
+
+--- include/Makefile.in.orig	2010-02-04 11:46:18.000000000 +0000
++++ include/Makefile.in
+@@ -395,14 +395,7 @@ HEADERS_GEN_MAKE = my_config.h
+ HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \
+ 			my_list.h my_alloc.h typelib.h mysql/plugin.h
+ 
+-pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \
+-			my_xml.h mysql_embed.h \
+-		  	my_pthread.h my_no_pthread.h \
+-			decimal.h errmsg.h my_global.h my_net.h \
+-			my_getopt.h sslopt-longopts.h my_dir.h \
+-			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
+-			m_ctype.h my_attribute.h $(HEADERS_GEN_CONFIGURE) \
+-			$(HEADERS_GEN_MAKE)
++pkginclude_HEADERS =
+ 
+ noinst_HEADERS = config-win.h config-netware.h my_bit.h \
+ 			heap.h my_bitmap.h my_uctype.h \
diff --git a/databases/mysql51-server/patches/patch-ah b/databases/mysql51-server/patches/patch-ah
new file mode 100644
index 00000000000..f90bf64c105
--- /dev/null
+++ b/databases/mysql51-server/patches/patch-ah
@@ -0,0 +1,26 @@
+$NetBSD: patch-ah,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $
+
+--- include/my_no_pthread.h.orig	2010-02-04 11:37:06.000000000 +0000
++++ include/my_no_pthread.h
+@@ -37,9 +37,21 @@
+   to make thread safe code, that should also work in single thread
+   environment, easier to use.
+ */
++#ifdef pthread_mutex_init
++#undef pthread_mutex_init
++#endif
+ #define pthread_mutex_init(A,B)
++#ifdef pthread_mutex_lock
++#undef pthread_mutex_lock
++#endif
+ #define pthread_mutex_lock(A)
++#ifdef pthread_mutex_unlock
++#undef pthread_mutex_unlock
++#endif
+ #define pthread_mutex_unlock(A)
++#ifdef pthread_mutex_destroy
++#undef pthread_mutex_destroy
++#endif
+ #define pthread_mutex_destroy(A)
+ #define my_rwlock_init(A,B)
+ #define rw_rdlock(A)
diff --git a/databases/mysql51-server/patches/patch-ai b/databases/mysql51-server/patches/patch-ai
new file mode 100644
index 00000000000..26820827af5
--- /dev/null
+++ b/databases/mysql51-server/patches/patch-ai
@@ -0,0 +1,29 @@
+$NetBSD: patch-ai,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $
+
+--- include/my_pthread.h.orig	2010-02-04 11:37:06.000000000 +0000
++++ include/my_pthread.h
+@@ -18,6 +18,13 @@
+ #ifndef _my_pthread_h
+ #define _my_pthread_h
+ 
++/* defines __NetBSD_Version__ */
++#if defined(__NetBSD__)
++#include <sys/param.h>
++#endif
++
++#include <signal.h>
++
+ #ifndef ETIME
+ #define ETIME ETIMEDOUT				/* For FreeBSD */
+ #endif
+@@ -237,6 +244,10 @@ int sigwait(sigset_t *set, int *sig);
+ #endif
+ 
+ #ifndef HAVE_NONPOSIX_SIGWAIT
++#if defined (__NetBSD__) && (__NetBSD_Version__ < 106130000)
++#define my_sigwait(A,B) __pthread_sigwait((A),(B))
++#else
++#endif
+ #define my_sigwait(A,B) sigwait((A),(B))
+ #else
+ int my_sigwait(const sigset_t *set,int *sig);
diff --git a/databases/mysql51-server/patches/patch-aj b/databases/mysql51-server/patches/patch-aj
new file mode 100644
index 00000000000..dc8ea084f9f
--- /dev/null
+++ b/databases/mysql51-server/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $
+
+--- man/Makefile.in.orig	2010-02-04 11:46:19.000000000 +0000
++++ man/Makefile.in
+@@ -380,7 +380,7 @@ yassl_h_ln_cmd = @yassl_h_ln_cmd@
+ yassl_libs = @yassl_libs@
+ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
+ zlib_dir = @zlib_dir@
+-man1_MANS = @man1_files@
++man1_MANS = mysqld_multi.1
+ man8_MANS = @man8_files@
+ EXTRA_DIST = $(man1_MANS) $(man8_MANS)
+ all: all-am
diff --git a/databases/mysql51-server/patches/patch-ak b/databases/mysql51-server/patches/patch-ak
new file mode 100644
index 00000000000..ff85e1277f7
--- /dev/null
+++ b/databases/mysql51-server/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $
+
+--- mysql-test/Makefile.in.orig	2010-02-04 11:46:20.000000000 +0000
++++ mysql-test/Makefile.in
+@@ -401,7 +401,7 @@ yassl_libs = @yassl_libs@
+ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
+ zlib_dir = @zlib_dir@
+ testroot = $(prefix)
+-testdir = $(testroot)/mysql-test
++testdir = $(testroot)/share/mysql-test
+ test_SCRIPTS = mtr \
+ 		mysql-test-run \
+ 		mysql-test-run.pl \
diff --git a/databases/mysql51-server/patches/patch-al b/databases/mysql51-server/patches/patch-al
new file mode 100644
index 00000000000..a6be5787cec
--- /dev/null
+++ b/databases/mysql51-server/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $
+
+--- mysys/my_gethwaddr.c.orig	2010-02-04 11:38:50.000000000 +0000
++++ mysys/my_gethwaddr.c
+@@ -33,7 +33,7 @@ static my_bool memcpy_and_test(uchar *to
+ }
+ #endif   /* FreeBSD || linux */
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ 
+ #include <net/ethernet.h>
+ #include <sys/sysctl.h>
diff --git a/databases/mysql51-server/patches/patch-am b/databases/mysql51-server/patches/patch-am
new file mode 100644
index 00000000000..cbe42436564
--- /dev/null
+++ b/databases/mysql51-server/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $
+
+--- mysys/stacktrace.c.orig	2010-02-04 11:38:51.000000000 +0000
++++ mysys/stacktrace.c
+@@ -327,7 +327,7 @@ void my_write_core(int sig)
+   __gcov_flush();
+ #endif
+   pthread_kill(pthread_self(), sig);
+-#if defined(P_MYID) && !defined(SCO)
++#if HAVE_SIGSEND && defined(P_MYID) && !defined(SCO)
+   /* On Solaris, the above kill is not enough */
+   sigsend(P_PID,P_MYID,sig);
+ #endif
diff --git a/databases/mysql51-server/patches/patch-an b/databases/mysql51-server/patches/patch-an
new file mode 100644
index 00000000000..3c92dfc69d7
--- /dev/null
+++ b/databases/mysql51-server/patches/patch-an
@@ -0,0 +1,33 @@
+$NetBSD: patch-an,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $
+
+--- scripts/Makefile.in.orig	2010-02-04 11:46:23.000000000 +0000
++++ scripts/Makefile.in
+@@ -409,19 +409,7 @@ BUILT_SOURCES = mysql_fix_privilege_tabl
+ 		mysql_fix_privilege_tables_sql.c
+ 
+ bin_SCRIPTS = @server_scripts@ \
+-			msql2mysql \
+-			mysql_config \
+-			mysql_fix_privilege_tables \
+-			mysql_fix_extensions \
+-			mysql_setpermission \
+ 			mysql_secure_installation \
+-			mysql_zap \
+-			mysqlaccess \
+-			mysqlbug \
+-			mysql_convert_table_format \
+-			mysql_find_rows \
+-			mysqlhotcopy \
+-			mysqldumpslow \
+ 			mysqld_multi
+ 
+ noinst_SCRIPTS = make_binary_distribution \
+@@ -727,7 +715,7 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-dist_pkgdataDATA
++install-data-am:
+ 
+ install-dvi: install-dvi-am
+ 
diff --git a/databases/mysql51-server/patches/patch-ao b/databases/mysql51-server/patches/patch-ao
new file mode 100644
index 00000000000..5b7b9f67039
--- /dev/null
+++ b/databases/mysql51-server/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $
+
+--- scripts/mysqld_safe.sh.orig	2010-02-04 11:38:53.000000000 +0000
++++ scripts/mysqld_safe.sh
+@@ -539,7 +539,7 @@ fi
+ # Alternatively, you can start mysqld with the "myisam-recover" option. See
+ # the manual for details.
+ #
+-# echo "Checking tables in $DATADIR"
++# log_notice "Checking tables in $DATADIR"
+ # $MY_BASEDIR_VERSION/bin/myisamchk --silent --force --fast --medium-check $DATADIR/*/*.MYI
+ # $MY_BASEDIR_VERSION/bin/isamchk --silent --force $DATADIR/*/*.ISM
+ 
diff --git a/databases/mysql51-server/patches/patch-ap b/databases/mysql51-server/patches/patch-ap
new file mode 100644
index 00000000000..6324503b363
--- /dev/null
+++ b/databases/mysql51-server/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $
+
+--- storage/myisam/Makefile.in.orig	2010-02-04 11:46:32.000000000 +0000
++++ storage/myisam/Makefile.in
+@@ -137,7 +137,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD
+ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
++CCLD = $(CXX)
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
diff --git a/databases/mysql51-server/patches/patch-aq b/databases/mysql51-server/patches/patch-aq
new file mode 100644
index 00000000000..74cf2c489b0
--- /dev/null
+++ b/databases/mysql51-server/patches/patch-aq
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $
+
+--- support-files/Makefile.in.orig	2010-02-04 11:46:45.000000000 +0000
++++ support-files/Makefile.in
+@@ -779,7 +779,7 @@ info: info-recursive
+ 
+ info-am:
+ 
+-install-data-am: install-aclocalDATA install-pkgsuppDATA \
++install-data-am: install-aclocalDATA \
+ 	install-pkgsuppSCRIPTS
+ 
+ install-dvi: install-dvi-recursive
diff --git a/databases/mysql51-server/patches/patch-ar b/databases/mysql51-server/patches/patch-ar
new file mode 100644
index 00000000000..44d1c726066
--- /dev/null
+++ b/databases/mysql51-server/patches/patch-ar
@@ -0,0 +1,32 @@
+$NetBSD: patch-ar,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $
+
+--- tests/Makefile.in.orig	2010-02-04 11:46:45.000000000 +0000
++++ tests/Makefile.in
+@@ -85,7 +85,7 @@ insert_test_LDADD = $(LDADD)
+ am_mysql_client_test_OBJECTS = mysql_client_test.$(OBJEXT) \
+ 	my_memmem.$(OBJEXT)
+ mysql_client_test_OBJECTS = $(am_mysql_client_test_OBJECTS)
+-am__DEPENDENCIES_1 = $(LIBMYSQLCLIENT_LA)
++am__DEPENDENCIES_1 =
+ am__DEPENDENCIES_2 =
+ mysql_client_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_2)
+@@ -95,7 +95,7 @@ select_test_LDADD = $(LDADD)
+ thread_test_SOURCES = thread_test.c
+ thread_test_OBJECTS = thread_test.$(OBJEXT)
+ thread_test_LDADD = $(LDADD)
+-thread_test_DEPENDENCIES = $(LIBMYSQLCLIENT_LA)
++thread_test_DEPENDENCIES =
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -437,8 +437,7 @@ EXTRA_DIST = auto_increment.res auto_inc
+ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
+ 			$(openssl_includes)
+ 
+-LDADD = @CLIENT_EXTRA_LDFLAGS@ \
+-                        $(LIBMYSQLCLIENT_LA)
++LDADD = @CLIENT_EXTRA_LDFLAGS@ -lmysqlclient
+ 
+ mysql_client_test_LDADD = $(LDADD) $(CXXLDFLAGS)
+ mysql_client_test_SOURCES = mysql_client_test.c\
diff --git a/databases/mysql51-server/patches/patch-as b/databases/mysql51-server/patches/patch-as
new file mode 100644
index 00000000000..709a912ae49
--- /dev/null
+++ b/databases/mysql51-server/patches/patch-as
@@ -0,0 +1,22 @@
+$NetBSD: patch-as,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $
+
+--- libmysql/Makefile.in.orig	2010-02-04 11:46:18.000000000 +0000
++++ libmysql/Makefile.in
+@@ -549,7 +549,6 @@ nh = my_global.h config-win32.h dbug.h e
+ # Get a list of the needed objects  
+ lobjs = $(mysysobjects1) $(dbugobjects) $(mystringsobjects) $(sqlobjects)
+ all: $(BUILT_SOURCES)
+-	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
+@@ -745,8 +744,7 @@ installdirs:
+ 	for dir in "$(DESTDIR)$(pkglibdir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+-install: $(BUILT_SOURCES)
+-	$(MAKE) $(AM_MAKEFLAGS) install-am
++install:
+ install-exec: install-exec-am
+ install-data: install-data-am
+ uninstall: uninstall-am
diff --git a/databases/mysql51-server/patches/patch-aw b/databases/mysql51-server/patches/patch-aw
new file mode 100644
index 00000000000..5d36284d08d
--- /dev/null
+++ b/databases/mysql51-server/patches/patch-aw
@@ -0,0 +1,13 @@
+$NetBSD: patch-aw,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $
+
+--- include/my_handler.h.orig	2010-02-04 11:37:06.000000000 +0000
++++ include/my_handler.h
+@@ -39,7 +39,7 @@ extern "C" {
+   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
+ */
+ 
+-#define HA_MAX_KEY_LENGTH           1000        /* Max length in bytes */
++#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
+ #define HA_MAX_KEY_SEG              16          /* Max segments for key */
+ 
+ #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
diff --git a/databases/mysql51-server/patches/patch-ax b/databases/mysql51-server/patches/patch-ax
new file mode 100644
index 00000000000..b8e9b53dcd5
--- /dev/null
+++ b/databases/mysql51-server/patches/patch-ax
@@ -0,0 +1,13 @@
+$NetBSD: patch-ax,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $
+
+--- include/myisam.h.orig	2010-02-04 11:37:06.000000000 +0000
++++ include/myisam.h
+@@ -48,7 +48,7 @@ extern "C" {
+   The following defines can be increased if necessary.
+   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
+ */
+-#define MI_MAX_KEY_LENGTH           1000            /* Max length in bytes */
++#define MI_MAX_KEY_LENGTH           4000            /* Max length in bytes */
+ #define MI_MAX_KEY_SEG              16              /* Max segments for key */
+ 
+ #define MI_MAX_KEY_BUFF  (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)