Date: Sun, 6 Jul 2014 12:27:22 +0000 (UTC) From: Florian Smeets <flo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360888 - in head/databases/percona56-server: . files Message-ID: <201407061227.s66CRM5N069072@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: flo Date: Sun Jul 6 12:27:22 2014 New Revision: 360888 URL: http://svnweb.freebsd.org/changeset/ports/360888 QAT: https://qat.redports.org/buildarchive/r360888/ Log: - Update to 5.6.19-67.0 - add new option, on by default, to enable InnoDB memcached plugin [1] PR: 191647 [1] Submitted by: dlundgren@syberisle.net Added: head/databases/percona56-server/files/patch-plugin_innodb_memcached_innodb_memcache_src_innodb_engine.c (contents, props changed) Modified: head/databases/percona56-server/Makefile head/databases/percona56-server/distinfo head/databases/percona56-server/pkg-plist Modified: head/databases/percona56-server/Makefile ============================================================================== --- head/databases/percona56-server/Makefile Sun Jul 6 12:22:26 2014 (r360887) +++ head/databases/percona56-server/Makefile Sun Jul 6 12:27:22 2014 (r360888) @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME?= percona -DISTVERSION= 5.6.17-66.0 +DISTVERSION= 5.6.19-67.0 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/ PKGNAMESUFFIX?= 56-server -DISTNAME= percona-server-5.6.17-66.0 +DISTNAME= percona-server-${DISTVERSION} MAINTAINER= flo@FreeBSD.org COMMENT?= Multithreaded SQL database (server) @@ -15,9 +15,12 @@ COMMENT?= Multithreaded SQL database (se SLAVEDIRS= databases/percona56-client USES= bison cmake shebangfix -OPTIONS_DEFINE= OPENSSL FASTMTX -OPTIONS_DEFAULT= OPENSSL +OPTIONS_DEFINE= OPENSSL FASTMTX INNODBMEMCACHED +OPTIONS_DEFAULT= OPENSSL INNODBMEMCACHED +OPTIONS_SUB= yes FASTMTX_DESC= Replace mutexes with spinlocks +INNODBMEMCACHED_DESC= InnoDB Memcached plugin +INNODBMEMCACHED_CMAKE_ON=-DWITH_INNODB_MEMCACHED=1 DATADIR= ${PREFIX}/share/mysql Modified: head/databases/percona56-server/distinfo ============================================================================== --- head/databases/percona56-server/distinfo Sun Jul 6 12:22:26 2014 (r360887) +++ head/databases/percona56-server/distinfo Sun Jul 6 12:27:22 2014 (r360888) @@ -1,2 +1,2 @@ -SHA256 (percona-server-5.6.17-66.0.tar.gz) = 645bb6f59d0478ac315a2a0a4e64fa3fc5a240547d464b274b2026643111fe98 -SIZE (percona-server-5.6.17-66.0.tar.gz) = 34093487 +SHA256 (percona-server-5.6.19-67.0.tar.gz) = 5099e9d0ec69124f44596005a2dad92697dc2b6f8ab54d32bdb089945b76c346 +SIZE (percona-server-5.6.19-67.0.tar.gz) = 34127811 Added: head/databases/percona56-server/files/patch-plugin_innodb_memcached_innodb_memcache_src_innodb_engine.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/percona56-server/files/patch-plugin_innodb_memcached_innodb_memcache_src_innodb_engine.c Sun Jul 6 12:27:22 2014 (r360888) @@ -0,0 +1,14 @@ +--- plugin/innodb_memcached/innodb_memcache/src/innodb_engine.c.orig 2014-07-05 20:51:49.603580203 +0000 ++++ plugin/innodb_memcached/innodb_memcache/src/innodb_engine.c 2014-07-05 21:00:01.470581456 +0000 +@@ -791,6 +791,11 @@ + read_crsr = conn_data->read_crsr; + + if (lock_mode == IB_LOCK_TABLE_X) { ++ // Fixes a bug where using "flush all" would crash the server ++ if (ib_cb_trx_state(conn_data->crsr_trx) == IB_TRX_NOT_STARTED) { ++ ib_cb_trx_release(conn_data->crsr_trx); ++ conn_data->crsr_trx = NULL; ++ } + assert(!conn_data->crsr_trx); + + conn_data->crsr_trx = ib_cb_trx_begin( Modified: head/databases/percona56-server/pkg-plist ============================================================================== --- head/databases/percona56-server/pkg-plist Sun Jul 6 12:22:26 2014 (r360887) +++ head/databases/percona56-server/pkg-plist Sun Jul 6 12:27:22 2014 (r360888) @@ -31,9 +31,11 @@ lib/mysql/plugin/auth.so lib/mysql/plugin/auth_test_plugin.so lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/handlersocket.so +%%INNODBMEMCACHED%%lib/mysql/plugin/innodb_engine.so lib/mysql/plugin/libdaemon_example.so lib/mysql/plugin/libfnv1a_udf.so lib/mysql/plugin/libfnv_udf.so +%%INNODBMEMCACHED%%lib/mysql/plugin/libmemcached.so lib/mysql/plugin/libmurmur_udf.so lib/mysql/plugin/mypluglib.so lib/mysql/plugin/qa_auth_client.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407061227.s66CRM5N069072>