diff options
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql60-server/Makefile | 9 | ||||
| -rw-r--r-- | databases/mysql60-server/files/patch-include_my_handler.h | 11 | ||||
| -rw-r--r-- | databases/mysql60-server/files/patch-include_myisam.h | 11 | ||||
| -rw-r--r-- | databases/mysql60-server/pkg-plist | 3 |
4 files changed, 32 insertions, 2 deletions
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile index 45fd11c21d4d..853fa9219b4f 100644 --- a/databases/mysql60-server/Makefile +++ b/databases/mysql60-server/Makefile @@ -7,7 +7,7 @@ PORTNAME?= mysql PORTVERSION= 6.0.9 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITE_SUBDIR= MySQL-6.0 @@ -111,6 +111,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:" @@ -132,13 +136,14 @@ 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-includeHEADERS|install-data-am:|g" ${WRKSRC}/extra/libevent/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 "s|PROGRAMS = \$$(noinst_PROGRAMS)|PROGRAMS =|g" ${WRKSRC}/storage/archive/Makefile.in @${REINPLACE_CMD} -e "/^AM_CXXFLAGS/s|=.*|+= \$$(NDB_CXXFLAGS)|" `${FIND} ${WRKSRC}/storage/ndb -name Makefile.in` .if defined(WITH_PROC_SCOPE_PTH) diff --git a/databases/mysql60-server/files/patch-include_my_handler.h b/databases/mysql60-server/files/patch-include_my_handler.h new file mode 100644 index 000000000000..5f0356b5c67a --- /dev/null +++ b/databases/mysql60-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 1332 /* 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/mysql60-server/files/patch-include_myisam.h b/databases/mysql60-server/files/patch-include_myisam.h new file mode 100644 index 000000000000..fd0aba7d7359 --- /dev/null +++ b/databases/mysql60-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 1332 /* 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/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist index 05df34447de5..1b49a01ac54b 100644 --- a/databases/mysql60-server/pkg-plist +++ b/databases/mysql60-server/pkg-plist @@ -10,6 +10,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 @@ -74,6 +76,7 @@ lib/mysql/libheap.a lib/mysql/libmaria.a lib/mysql/libmyisam.a lib/mysql/libmyisammrg.a +lib/mysql/libmysqld.a lib/mysql/libmystrings.a lib/mysql/libmystrings.la lib/mysql/libmysys.a |