[Midnightbsd-cvs] mports: databases/mysql60-server: Update to mysql-server 6.0.9
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Mar 13 22:25:46 EDT 2009
Log Message:
-----------
Update to mysql-server 6.0.9
Modified Files:
--------------
mports/databases/mysql60-server:
Makefile (r1.2 -> r1.3)
distinfo (r1.1 -> r1.2)
pkg-plist (r1.1 -> r1.2)
mports/databases/mysql60-server/files:
patch-configure (r1.1 -> r1.2)
patch-extra_yassl_Makefile.in (r1.1 -> r1.2)
patch-extra_yassl_taocrypt_Makefile.in (r1.1 -> r1.2)
patch-mysys_default.c (r1.1 -> r1.2)
Added Files:
-----------
mports/databases/mysql60-server/files:
patch-64045 (r1.1)
patch-include_my_handler.h (r1.1)
patch-include_myisam.h (r1.1)
patch-storage_maria_Makefile.in (r1.1)
patch-storage_ndb_src_kernel_Makefile.in (r1.1)
patch-storage_ndb_src_ndbapi_Makefile.in (r1.1)
Removed Files:
-------------
mports/databases/mysql60-server/files:
patch-client_mysql_upgrade.c
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/databases/mysql60-server/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L databases/mysql60-server/pkg-plist -L databases/mysql60-server/pkg-plist -u -r1.1 -r1.2
--- databases/mysql60-server/pkg-plist
+++ databases/mysql60-server/pkg-plist
@@ -1,10 +1,17 @@
@stopdaemon mysql-server
bin/innochecksum
+bin/maria_chk
+bin/maria_dump_log
+bin/maria_ftdump
+bin/maria_pack
+bin/maria_read_log
bin/my_print_defaults
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
@@ -19,7 +26,6 @@
%%NDB%%bin/ndb_print_backup_file
%%NDB%%bin/ndb_print_schema_file
%%NDB%%bin/ndb_print_sys_file
-%%NDB%%bin/ndb_redo_log_reader
%%NDB%%bin/ndb_restore
%%NDB%%bin/ndb_select_all
%%NDB%%bin/ndb_select_count
@@ -27,6 +33,7 @@
%%NDB%%bin/ndb_size.pl
%%NDB%%bin/ndb_test_platform
%%NDB%%bin/ndb_waiter
+%%NDB%%bin/ndbd_redo_log_reader
bin/perror
bin/replace
bin/resolve_stack_dump
@@ -64,15 +71,20 @@
%%NDB%%include/mysql/storage/ndb/ndbapi/ndb_opt_defaults.h
%%NDB%%include/mysql/storage/ndb/ndbapi/ndberror.h
lib/mysql/libdbug.a
+lib/mysql/libdbug.la
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
+lib/mysql/libmysys.la
%%NDB%%lib/mysql/libndbclient.a
%%NDB%%lib/mysql/libndbclient.la
%%NDB%%lib/mysql/libndbclient.so
-%%NDB%%lib/mysql/libndbclient.so.3
+%%NDB%%lib/mysql/libndbclient.so.4
lib/mysql/libvio.a
lib/mysql/plugin/ha_example.a
lib/mysql/plugin/ha_example.la
@@ -82,6 +94,7 @@
%%NDB%%libexec/ndb_cpcd
%%NDB%%libexec/ndb_mgmd
%%NDB%%libexec/ndbd
+%%DATADIR%%/ChangeLog
%%DATADIR%%/binary-configure
%%DATADIR%%/charsets/Index.xml
%%DATADIR%%/charsets/README
@@ -126,6 +139,9 @@
%%DATADIR%%/italian/errmsg.sys
%%DATADIR%%/japanese/errmsg.sys
%%DATADIR%%/korean/errmsg.sys
+%%DATADIR%%/ma_test_all
+%%DATADIR%%/ma_test_all.res
+%%DATADIR%%/ma_test_recovery
%%DATADIR%%/mi_test_all
%%DATADIR%%/mi_test_all.res
%%DATADIR%%/my-huge.cnf
@@ -149,6 +165,32 @@
%%DATADIR%%/slovak/errmsg.sys
%%DATADIR%%/spanish/errmsg.sys
%%DATADIR%%/swedish/errmsg.sys
+%%NDB%%%%DATADIR%%/swig/globals.i
+%%NDB%%%%DATADIR%%/swig/mgmapi/ClusterState.i
+%%NDB%%%%DATADIR%%/swig/mgmapi/NdbLogEvent.i
+%%NDB%%%%DATADIR%%/swig/mgmapi/NdbLogEventManager.i
+%%NDB%%%%DATADIR%%/swig/mgmapi/NdbMgm.i
+%%NDB%%%%DATADIR%%/swig/mgmapi/NdbMgmFactory.i
+%%NDB%%%%DATADIR%%/swig/mgmapi/NdbMgmReply.i
+%%NDB%%%%DATADIR%%/swig/mgmapi/NodeState.i
+%%NDB%%%%DATADIR%%/swig/mgmapi/events.i
+%%NDB%%%%DATADIR%%/swig/mgmapi/listeners.i
+%%NDB%%%%DATADIR%%/swig/mgmapi/mgmglobals.i
+%%NDB%%%%DATADIR%%/swig/ndbapi/Ndb.i
+%%NDB%%%%DATADIR%%/swig/ndbapi/NdbBlob.i
+%%NDB%%%%DATADIR%%/swig/ndbapi/NdbClusterConnection.i
+%%NDB%%%%DATADIR%%/swig/ndbapi/NdbDictionary.i
+%%NDB%%%%DATADIR%%/swig/ndbapi/NdbError.i
+%%NDB%%%%DATADIR%%/swig/ndbapi/NdbEventOperation.i
+%%NDB%%%%DATADIR%%/swig/ndbapi/NdbFactory.i
+%%NDB%%%%DATADIR%%/swig/ndbapi/NdbIndexOperation.i
+%%NDB%%%%DATADIR%%/swig/ndbapi/NdbIndexScanOperation.i
+%%NDB%%%%DATADIR%%/swig/ndbapi/NdbOperation.i
+%%NDB%%%%DATADIR%%/swig/ndbapi/NdbRecAttr.i
+%%NDB%%%%DATADIR%%/swig/ndbapi/NdbScanFilter.i
+%%NDB%%%%DATADIR%%/swig/ndbapi/NdbScanOperation.i
+%%NDB%%%%DATADIR%%/swig/ndbapi/NdbTransaction.i
+%%NDB%%%%DATADIR%%/swig/ndbapi/ndbglobals.i
%%DATADIR%%/ukrainian/errmsg.sys
%%NDB%%@dirrm include/mysql/storage/ndb/mgmapi
%%NDB%%@dirrm include/mysql/storage/ndb/ndbapi
@@ -180,5 +222,8 @@
@dirrm %%DATADIR%%/slovak
@dirrm %%DATADIR%%/spanish
@dirrm %%DATADIR%%/swedish
+%%NDB%%@dirrm %%DATADIR%%/swig/mgmapi
+%%NDB%%@dirrm %%DATADIR%%/swig/ndbapi
+%%NDB%%@dirrm %%DATADIR%%/swig
@dirrm %%DATADIR%%/ukrainian
@dirrmtry %%DATADIR%%
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/databases/mysql60-server/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L databases/mysql60-server/Makefile -L databases/mysql60-server/Makefile -u -r1.2 -r1.3
--- databases/mysql60-server/Makefile
+++ databases/mysql60-server/Makefile
@@ -6,7 +6,7 @@
PORTNAME?= mysql
-PORTVERSION= 6.0.5
+PORTVERSION= 6.0.9
PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL}
@@ -29,6 +29,7 @@
--without-libedit \
--with-libwrap \
--with-mysqlfs \
+ --with-zlib-dir=/usr \
--with-low-memory \
--with-comment='MidnightBSD port: ${PKGNAME}' \
--enable-thread-safe-client
@@ -74,7 +75,7 @@
CONFIGURE_ARGS+=-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads
CFLAGS+= -D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE
CFLAGS+= -I${LOCALBASE}/include/pthread/linuxthreads
-LIB_DEPENDS+= lthread.[35]:${PORTSDIR}/devel/linuxthreads
+LIB_DEPENDS+= lthread:${PORTSDIR}/devel/linuxthreads
CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r -llstdc++ -llsupc++'
.else
CONFIGURE_ARGS+=--with-named-thread-libs=${PTHREAD_LIBS}
@@ -111,6 +112,11 @@
INFO= mysql
+CONFIGURE_ARGS+=--with-embedded-server
+
+CFLAGS+= -fPIC
+
+
pre-fetch:
@${ECHO} ""
@${ECHO} "You may use the following build options:"
@@ -132,13 +138,14 @@
@${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)
@@ -160,18 +167,16 @@
MAN1= mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \
mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1
-MAN8= mysqlmanager.8
-
USE_LDCONFIG= ${PREFIX}/lib/mysql
CONFIGURE_ARGS+=--without-server
post-patch:
@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include sql-common scripts strings regex mysys dbug extra libmysql libmysql_r client @man_dirs@|g" ${WRKSRC}/Makefile.in
- @${REINPLACE_CMD} -e "s|install-exec-am: install-pkglibLIBRARIES|install-exec-am:|g" ${WRKSRC}/strings/Makefile.in ${WRKSRC}/mysys/Makefile.in ${WRKSRC}/dbug/Makefile.in
+ @${REINPLACE_CMD} -e "s|install-exec-am: install-pkglibLTLIBRARIES|install-exec-am:|g" ${WRKSRC}/strings/Makefile.in ${WRKSRC}/mysys/Makefile.in ${WRKSRC}/dbug/Makefile.in
@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = mysql_config mysql_fix_privilege_tables mysqlbug|g" ${WRKSRC}/scripts/Makefile.in
@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in
- @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g;s|man8_MANS =|man8_MANS = ${MAN8}|g" ${WRKSRC}/man/Makefile.in
+ @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
@${REINPLACE_CMD} -e "s|install-exec-am: install-binPROGRAMS|install-exec-am:|g" ${WRKSRC}/extra/Makefile.in
post-install:
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/databases/mysql60-server/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L databases/mysql60-server/distinfo -L databases/mysql60-server/distinfo -u -r1.1 -r1.2
--- databases/mysql60-server/distinfo
+++ databases/mysql60-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-6.0.5-alpha.tar.gz) = 8e637e3c0c9d10645a9f188094bf6709
-SHA256 (mysql-6.0.5-alpha.tar.gz) = 0834a1c731905b10fdc5099ef395dd38b38b0a2ee28eb725cf4614f50ecf84ce
-SIZE (mysql-6.0.5-alpha.tar.gz) = 29979599
+MD5 (mysql-6.0.9-alpha.tar.gz) = e2c4c820356f4bdfbf50ec5b7c788140
+SHA256 (mysql-6.0.9-alpha.tar.gz) = 0888b9c822aa3f84c63e819f37df8081553c9f429dfc5a1cf19be16a9f69807f
+SIZE (mysql-6.0.9-alpha.tar.gz) = 35513752
Index: patch-extra_yassl_Makefile.in
===================================================================
RCS file: /home/cvs/mports/databases/mysql60-server/files/patch-extra_yassl_Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L databases/mysql60-server/files/patch-extra_yassl_Makefile.in -L databases/mysql60-server/files/patch-extra_yassl_Makefile.in -u -r1.1 -r1.2
--- databases/mysql60-server/files/patch-extra_yassl_Makefile.in
+++ databases/mysql60-server/files/patch-extra_yassl_Makefile.in
@@ -1,11 +1,11 @@
---- extra/yassl/Makefile.in.orig Thu Oct 26 14:02:58 2006
-+++ extra/yassl/Makefile.in Tue Nov 7 08:17:34 2006
-@@ -351,7 +351,7 @@
+--- extra/yassl/Makefile.in.orig 2008-08-12 17:34:32.000000000 +0200
++++ extra/yassl/Makefile.in 2008-08-27 12:27:58.000000000 +0200
+@@ -387,7 +387,7 @@
yassl_libs = @yassl_libs@
yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
zlib_dir = @zlib_dir@
-SUBDIRS = taocrypt src testsuite
+SUBDIRS = taocrypt src
- EXTRA_DIST = yassl.dsp yassl.dsw yassl.vcproj \
- CMakeLists.txt
+ EXTRA_DIST = CMakeLists.txt
+ all: all-recursive
--- /dev/null
+++ databases/mysql60-server/files/patch-storage_ndb_src_ndbapi_Makefile.in
@@ -0,0 +1,12 @@
+--- storage/ndb/src/ndbapi/Makefile.in.orig 2009-01-18 12:30:08.000000000 +0100
++++ storage/ndb/src/ndbapi/Makefile.in 2009-01-18 12:30:38.000000000 +0100
+@@ -530,8 +530,7 @@
+ ndberror_check_LDFLAGS = \
+ $(top_builddir)/dbug/libdbuglt.la \
+ $(top_builddir)/mysys/libmysyslt.la \
+- $(top_builddir)/strings/libmystringslt.la \
+- $(top_builddir)/zlib/libzlt.la
++ $(top_builddir)/strings/libmystringslt.la
+
+ all: all-am
+
--- /dev/null
+++ databases/mysql60-server/files/patch-storage_maria_Makefile.in
@@ -0,0 +1,11 @@
+--- storage/maria/Makefile.in.orig 2008-08-27 14:50:26.000000000 +0200
++++ storage/maria/Makefile.in 2008-08-27 14:50:44.000000000 +0200
+@@ -512,7 +512,7 @@
+ LDADD =
+
+ # "." is needed first because tests in unittest need libmaria
+-SUBDIRS = . unittest
++SUBDIRS = .
+ EXTRA_DIST = ma_test_all.sh ma_test_all.res ma_test_big.sh \
+ ma_ft_stem.c CMakeLists.txt plug.in ma_test_recovery
+
Index: patch-extra_yassl_taocrypt_Makefile.in
===================================================================
RCS file: /home/cvs/mports/databases/mysql60-server/files/patch-extra_yassl_taocrypt_Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L databases/mysql60-server/files/patch-extra_yassl_taocrypt_Makefile.in -L databases/mysql60-server/files/patch-extra_yassl_taocrypt_Makefile.in -u -r1.1 -r1.2
--- databases/mysql60-server/files/patch-extra_yassl_taocrypt_Makefile.in
+++ databases/mysql60-server/files/patch-extra_yassl_taocrypt_Makefile.in
@@ -1,11 +1,11 @@
---- extra/yassl/taocrypt/Makefile.in.orig Thu Oct 26 14:02:59 2006
-+++ extra/yassl/taocrypt/Makefile.in Tue Nov 7 08:18:38 2006
-@@ -351,7 +351,7 @@
+--- extra/yassl/taocrypt/Makefile.in.orig 2008-08-12 17:34:32.000000000 +0200
++++ extra/yassl/taocrypt/Makefile.in 2008-08-27 12:33:51.000000000 +0200
+@@ -387,7 +387,7 @@
yassl_libs = @yassl_libs@
yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
zlib_dir = @zlib_dir@
-SUBDIRS = src test benchmark
+SUBDIRS = src
- EXTRA_DIST = taocrypt.dsw taocrypt.dsp taocrypt.vcproj CMakeLists.txt $(wildcard mySTL/*.hpp)
+ EXTRA_DIST = CMakeLists.txt $(wildcard mySTL/*.hpp)
all: all-recursive
--- databases/mysql60-server/files/patch-client_mysql_upgrade.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- client/mysql_upgrade.c.orig 2008-01-29 22:42:00.000000000 +0100
-+++ client/mysql_upgrade.c 2008-02-14 08:29:52.000000000 +0100
-@@ -427,10 +427,6 @@
-
- verbose("Looking for '%s' in: %s", tool_name, tool_path);
-
-- /* Make sure the tool exists */
-- if (my_access(tool_path, F_OK) != 0)
-- die("Can't find '%s'", tool_path);
--
- /*
- Make sure it can be executed
- */
--- /dev/null
+++ 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)
Index: patch-mysys_default.c
===================================================================
RCS file: /home/cvs/mports/databases/mysql60-server/files/patch-mysys_default.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L databases/mysql60-server/files/patch-mysys_default.c -L databases/mysql60-server/files/patch-mysys_default.c -u -r1.1 -r1.2
--- databases/mysql60-server/files/patch-mysys_default.c
+++ databases/mysql60-server/files/patch-mysys_default.c
@@ -1,6 +1,6 @@
---- mysys/default.c.orig 2008-04-08 13:23:13.000000000 +0200
-+++ mysys/default.c 2008-04-21 19:20:44.000000000 +0200
-@@ -623,7 +623,7 @@
+--- mysys/default.c.orig 2008-08-12 17:31:37.000000000 +0200
++++ mysys/default.c 2008-08-27 12:38:14.000000000 +0200
+@@ -638,7 +638,7 @@
{
MY_STAT stat_info;
if (!my_stat(name,&stat_info,MYF(0)))
@@ -9,11 +9,14 @@
/*
Ignore world-writable regular files.
This is mainly done to protect us to not read a file created by
-@@ -1105,6 +1105,7 @@
- #ifdef DEFAULT_SYSCONFDIR
+@@ -1091,7 +1091,10 @@
+
+ #if defined(DEFAULT_SYSCONFDIR)
if (DEFAULT_SYSCONFDIR != "")
- ADD_DIRECTORY(DEFAULT_SYSCONFDIR);
-+ ADD_DIRECTORY(DEFAULT_SYSCONFDIR "/mysql/");
++ {
+ errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
++ errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
++ }
+ #endif /* DEFAULT_SYSCONFDIR */
+
#endif
- ADD_COMMON_DIRECTORIES();
- ADD_DIRECTORY("~/");
Index: patch-configure
===================================================================
RCS file: /home/cvs/mports/databases/mysql60-server/files/patch-configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -L databases/mysql60-server/files/patch-configure -L databases/mysql60-server/files/patch-configure -u -r1.1 -r1.2
--- databases/mysql60-server/files/patch-configure
+++ databases/mysql60-server/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig Sat May 26 12:22:14 2007
-+++ configure Fri Jun 1 07:53:46 2007
-@@ -20394,8 +20394,6 @@
+--- configure.orig 2009-01-02 16:59:54.000000000 +0100
++++ configure 2009-01-18 10:14:57.000000000 +0100
+@@ -21832,8 +21832,6 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -9,7 +9,23 @@
# Prevent multiple expansion
-@@ -26935,8 +26933,8 @@
+@@ -27046,13 +27044,14 @@
+ { $as_echo "$as_me:$LINENO: result: using bundled zlib" >&5
+ $as_echo "using bundled zlib" >&6; }
+ ;;
+- "")
++ *)
+ ZLIB_INCLUDES=""
+ ZLIB_LIBS="-lz"
+
+ save_CPPFLAGS="$CPPFLAGS"
+ save_LIBS="$LIBS"
+ CPPFLAGS="$ZLIB_INCLUDES $CPPFLAGS"
++LIBS="$ZLIB_LIBS $LIBS"
+ if test X"$with_server" = Xno
+ then
+ zlibsym=zlibVersion
+@@ -29214,8 +29213,8 @@
# Some system specific hacks
#
--- /dev/null
+++ databases/mysql60-server/files/patch-storage_ndb_src_kernel_Makefile.in
@@ -0,0 +1,21 @@
+--- storage/ndb/src/kernel/Makefile.in.orig 2009-01-18 12:52:07.000000000 +0100
++++ storage/ndb/src/kernel/Makefile.in 2009-01-18 12:52:20.000000000 +0100
+@@ -120,8 +120,7 @@
+ $(top_builddir)/storage/ndb/src/common/util/libgeneral.la \
+ $(top_builddir)/dbug/libdbuglt.la \
+ $(top_builddir)/mysys/libmysyslt.la \
+- $(top_builddir)/strings/libmystringslt.la \
+- $(top_builddir)/zlib/libzlt.la
++ $(top_builddir)/strings/libmystringslt.la
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/include
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -498,7 +497,7 @@
+ $(top_builddir)/dbug/libdbuglt.la \
+ $(top_builddir)/mysys/libmysyslt.la \
+ $(top_builddir)/strings/libmystringslt.la \
+- $(top_builddir)/zlib/libzlt.la @NDB_SCI_LIBS@
++ @NDB_SCI_LIBS@
+ NDB_CXXFLAGS = @ndb_cxxflags_fix@ $(NDB_CXXFLAGS_LOC)
+ NDB_AM_CXXFLAGS := $(AM_CXXFLAGS)
+ AM_CXXFLAGS = $(NDB_AM_CXXFLAGS) $(NDB_CXXFLAGS)
--- /dev/null
+++ databases/mysql60-server/files/patch-64045
@@ -0,0 +1,115 @@
+=== modified file 'include/my_pthread.h'
+--- include/my_pthread.h 2008-12-14 11:36:15 +0000
++++ include/my_pthread.h 2009-01-26 15:56:07 +0000
+@@ -621,6 +621,7 @@ extern pthread_mutexattr_t my_errorcheck
+
+ typedef ulong my_thread_id;
+
++extern my_bool my_threadattr_global_init(void);
+ extern my_bool my_thread_global_init(void);
+ extern void my_thread_global_end(void);
+ extern my_bool my_thread_init(void);
+
+=== modified file 'mysys/my_init.c'
+--- mysys/my_init.c 2009-01-16 11:49:33 +0000
++++ mysys/my_init.c 2009-01-26 15:56:07 +0000
+@@ -84,11 +84,14 @@ my_bool my_init(void)
+ if (my_progname)
+ my_progname_short= my_progname + dirname_length(my_progname);
+
+-#if defined(THREAD) && defined(SAFE_MUTEX)
++#if defined(THREAD)
++ if (my_threadattr_global_init())
++ return 1;
++# if defined(SAFE_MUTEX)
+ safe_mutex_global_init(); /* Must be called early */
+-#endif
+-#if defined(THREAD) && defined(MY_PTHREAD_FASTMUTEX) && !defined(SAFE_MUTEX)
++# elif defined(MY_PTHREAD_FASTMUTEX)
+ fastmutex_global_init(); /* Must be called early */
++# endif
+ #endif
+ netware_init();
+ #ifdef THREAD
+
+=== modified file 'mysys/my_thr_init.c'
+--- mysys/my_thr_init.c 2008-12-13 16:34:25 +0000
++++ mysys/my_thr_init.c 2009-01-26 15:56:07 +0000
+@@ -68,6 +68,47 @@ nptl_pthread_exit_hack_handler(void *arg
+ #endif /* TARGET_OS_LINUX */
+
+
++
++/*
++ initialize thread attributes
++
++ SYNOPSIS
++ my_threadattr_global_init()
++
++ RETURN is error?
++ FALSE ok
++ TRUE error
++*/
++
++my_bool my_threadattr_global_init(void)
++{
++#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
++ /*
++ Set mutex type to "fast" a.k.a "adaptive"
++
++ In this case the thread may steal the mutex from some other thread
++ that is waiting for the same mutex. This will save us some
++ context switches but may cause a thread to 'starve forever' while
++ waiting for the mutex (not likely if the code within the mutex is
++ short).
++ */
++ pthread_mutexattr_init(&my_fast_mutexattr); /* ?= MY_MUTEX_INIT_FAST */
++ pthread_mutexattr_settype(&my_fast_mutexattr,
++ PTHREAD_MUTEX_ADAPTIVE_NP);
++#endif
++#ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
++ /*
++ Set mutex type to "errorcheck"
++ */
++ pthread_mutexattr_init(&my_errorcheck_mutexattr);
++ pthread_mutexattr_settype(&my_errorcheck_mutexattr,
++ PTHREAD_MUTEX_ERRORCHECK);
++#endif
++
++ return FALSE;
++}
++
++
+ static uint get_thread_lib(void);
+
+ /*
+@@ -127,28 +168,6 @@ my_bool my_thread_global_init(void)
+ if (my_thread_init())
+ return 1;
+
+-#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
+- /*
+- Set mutex type to "fast" a.k.a "adaptive"
+-
+- In this case the thread may steal the mutex from some other thread
+- that is waiting for the same mutex. This will save us some
+- context switches but may cause a thread to 'starve forever' while
+- waiting for the mutex (not likely if the code within the mutex is
+- short).
+- */
+- pthread_mutexattr_init(&my_fast_mutexattr);
+- pthread_mutexattr_settype(&my_fast_mutexattr,
+- PTHREAD_MUTEX_ADAPTIVE_NP);
+-#endif
+-#ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
+- /*
+- Set mutex type to "errorcheck"
+- */
+- pthread_mutexattr_init(&my_errorcheck_mutexattr);
+- pthread_mutexattr_settype(&my_errorcheck_mutexattr,
+- PTHREAD_MUTEX_ERRORCHECK);
+-#endif
+
+ /* Mutex uses by mysys */
+ pthread_mutex_init(&THR_LOCK_open,MY_MUTEX_INIT_FAST);
+
--- /dev/null
+++ 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)
More information about the Midnightbsd-cvs
mailing list