ports/171227: [MAINTAINER] databases/mariadb-server: support big keys

[Geoffroy Desvernay]

>Number:         171227
>Category:       ports
>Synopsis:       [MAINTAINER] databases/mariadb-server: support big keys
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 01 08:20:09 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Geoffroy Desvernay
>Release:        FreeBSD 9.0-STABLE amd64
>Organization:
Ecole Centrale de Marseille
>Environment:
System: FreeBSD dgeo.sysadm.ec-m.fr 9.0-STABLE FreeBSD 9.0-STABLE #0: Wed Jun 20 12:43:59 CEST 2012
>Description:
Add support for >1000B keys as an option.

Patch derived from the one used in mysql's port.

Added file(s):
- files/extra-patch-include__my_handler.h

Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: suffix)
>How-To-Repeat:
>Fix:

--- mariadb-server-5.3.7_1.patch begins here ---
diff -ruN --exclude=CVS ../mariadb-server.orig/Makefile ./Makefile
--- ../mariadb-server.orig/Makefile	2012-06-18 02:07:28.000000000 +0200
+++ ./Makefile	2012-09-01 10:13:51.000000000 +0200
@@ -6,7 +6,7 @@
 
 PORTNAME=	mariadb
 PORTVERSION=	5.3.7
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
 		http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
@@ -69,7 +69,7 @@
 		ARCHIVE "Archive storage plugin" On \
 		BLACKHOLE "Blackhole storage engine" On \
 		SPHINX "SE client for Sphinx search daemon" On \
-		FEDX "FederatedX storage engine (Federated replacement)" On \
+		FEDX "FederatedX (new) storage engine" On \
 		FEDERATED "Federated (old) storage engine" Off \
 		XTRADB "XtraDB (InnoDB replacement) engine" On \
 		INNODB "InnoDB (old) engine" Off \
@@ -78,7 +78,8 @@
 		PARTITION "Partitioning support" Off \
 		HANDLERSOCKET "HandlerSocket support" On \
 		NDB "Enable NDB support (implies PARTITION)" Off \
-		EXAMPLES "Example engine,daemon and ftsearch plugins" Off
+		EXAMPLES "Example engine,daemon and ftsearch plugins" Off \
+		MAXKEY "Change max key length from 1000 to 4000" Off
 .endif	# .if !defined(MARIADB_CLIENT_SLAVE)
 
 .include <bsd.port.options.mk>
@@ -220,6 +221,9 @@
 .else
 PLIST_SUB+=	STATIC=""
 .endif
+.if defined(WITH_MAXKEY)
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-include__my_handler.h
+.endif
 .endif	# .if !defined(MARIADB_CLIENT_SLAVE)
 
 .if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
@@ -259,7 +263,7 @@
 	@${ECHO} "		Other built-in charsets (default: complex, selected: ${WITH_XCHARSET})."
 	@${ECHO} ''
 
-EXTRA_PATCHES=	${FILESDIR}/scripts__Makefile.in
+EXTRA_PATCHES+=	${FILESDIR}/scripts__Makefile.in
 MDB_SERVER_SUBDIRS=	include @docs_dirs@ sql-common libservices mysys strings dbug ${MDB_EXTRA_SUBDIRS} unittest cmd-line-utils libmysql scripts @sql_server_dirs@ @sql_server@ @man_dirs@ @libmysqld_dirs@ support-files
 
 post-patch:
diff -ruN --exclude=CVS ../mariadb-server.orig/files/extra-patch-include__my_handler.h ./files/extra-patch-include__my_handler.h
--- ../mariadb-server.orig/files/extra-patch-include__my_handler.h	1970-01-01 01:00:00.000000000 +0100
+++ ./files/extra-patch-include__my_handler.h	2012-09-01 10:13:46.000000000 +0200
@@ -0,0 +1,11 @@
+--- include/my_handler.h.orig	2012-08-30 21:44:42.000000000 +0200
++++ include/my_handler.h	2012-08-30 21:45:23.000000000 +0200
+@@ -34,7 +34,7 @@
+   But beware the dependency of HA_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              32          /* Max segments for key */
+ 
+ #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6) 
--- mariadb-server-5.3.7_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: