5 files changed, 35 insertions, 6 deletions

diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 55d16c1be290..193c0bb3ce77 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.30
+PORTVERSION=	5.1.31
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -27,7 +27,6 @@ CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-readline \
 		--without-libedit \
 		--with-libwrap \
-		--with-mysqlfs \
 		--with-low-memory \
 		--with-comment='FreeBSD port: ${PKGNAME}' \
 		--enable-thread-safe-client
@@ -107,6 +106,10 @@ MAN1=		myisamchk.1 myisamlog.1 myisampack.1 \
 
 INFO=		mysql
 
+CONFIGURE_ARGS+=--with-embedded-server
+
+CFLAGS+=	-fPIC
+
 pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
@@ -127,12 +130,13 @@ pre-fetch:
 	@${ECHO} ""
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ sql-common @sql_server_dirs@ storage scripts @sql_server@ @man_dirs@ support-files|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ sql-common @sql_server_dirs@ libmysql storage scripts @sql_server@ @man_dirs@ @libmysqld_dirs@ support-files|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@|g" ${WRKSRC}/scripts/Makefile.in
 	@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql mysql_system_tables.sql mysql_system_tables_data.sql|g" ${WRKSRC}/scripts/Makefile.in
 	@${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
 	@${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/extra/Makefile.in
 	@${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in
+	@${REINPLACE_CMD} -e "s|install-exec-am: install-pkglibLTLIBRARIES|install-exec-am:|g" ${WRKSRC}/libmysql/Makefile.in
 	@${REINPLACE_CMD} -e "/^AM_CXXFLAGS/s|=.*|+= \$$(NDB_CXXFLAGS)|" `${FIND} ${WRKSRC}/storage/ndb -name Makefile.in`
 .if defined(WITH_PROC_SCOPE_PTH)
 	@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/sql/mysqld.cc
diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo
index b075a61783e9..bcb7066ffa5f 100644
--- a/databases/mysql54-server/distinfo
+++ b/databases/mysql54-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.30.tar.gz) = b658e58887a74dce65224ae0fc8ee06a
-SHA256 (mysql-5.1.30.tar.gz) = cca90f5209808829e5bc811c5c017a054a4f75188e939b1c1c8b270d0514f624
-SIZE (mysql-5.1.30.tar.gz) = 29050568
+MD5 (mysql-5.1.31.tar.gz) = a077387e04ea24e67a93cff5f05bc3ba
+SHA256 (mysql-5.1.31.tar.gz) = d3cf8ec3d01eeb71b0e1927e4aa96694accead5aeaef8758150907ceb29e75ee
+SIZE (mysql-5.1.31.tar.gz) = 30842205
diff --git a/databases/mysql54-server/files/patch-include_my_handler.h b/databases/mysql54-server/files/patch-include_my_handler.h
new file mode 100644
index 000000000000..5362f8b69105
--- /dev/null
+++ b/databases/mysql54-server/files/patch-include_my_handler.h
@@ -0,0 +1,11 @@
+--- include/my_handler.h.orig	2009-02-16 23:09:40.000000000 +0100
++++ include/my_handler.h	2009-02-16 23:09:55.000000000 +0100
+@@ -39,7 +39,7 @@
+   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/mysql54-server/files/patch-include_myisam.h b/databases/mysql54-server/files/patch-include_myisam.h
new file mode 100644
index 000000000000..450645400dd5
--- /dev/null
+++ b/databases/mysql54-server/files/patch-include_myisam.h
@@ -0,0 +1,11 @@
+--- include/myisam.h.orig	2009-02-16 23:04:54.000000000 +0100
++++ include/myisam.h	2009-02-16 23:10:08.000000000 +0100
+@@ -48,7 +48,7 @@
+   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)
diff --git a/databases/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist
index 8d320523e2fc..16f5e2330810 100644
--- a/databases/mysql54-server/pkg-plist
+++ b/databases/mysql54-server/pkg-plist
@@ -5,6 +5,8 @@ bin/myisam_ftdump
 bin/myisamchk
 bin/myisamlog
 bin/myisampack
+bin/mysqltest_embedded
+bin/mysql_client_test_embedded
 bin/mysql_install_db
 bin/mysql_tzinfo_to_sql
 bin/mysql_waitpid
@@ -65,6 +67,7 @@ lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmyisam.a
 lib/mysql/libmyisammrg.a
+lib/mysql/libmysqld.a
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 %%NDB%%lib/mysql/libndbclient.a