diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2014-07-06 12:27:22 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2014-07-06 12:27:22 +0000 |
| commit | d001a438c85775d6fa7cb0f3be01a5e63b959052 (patch) | |
| tree | c0dfbfa029fc7af0cf00b628a783365b5d53b7e0 /databases/percona56-server | |
| parent | 37ed1f96e8cae6c27e1eb6d0a3cc090d1a42d978 (diff) | |
| download | ports-d001a438c85775d6fa7cb0f3be01a5e63b959052.tar.gz ports-d001a438c85775d6fa7cb0f3be01a5e63b959052.zip | |
- 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
Notes
Notes:
svn path=/head/; revision=360888
Diffstat (limited to 'databases/percona56-server')
4 files changed, 25 insertions, 6 deletions
diff --git a/databases/percona56-server/Makefile b/databases/percona56-server/Makefile index 3667e05ec04b..cbffc5a3f9c4 100644 --- a/databases/percona56-server/Makefile +++ b/databases/percona56-server/Makefile @@ -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 (server) 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 diff --git a/databases/percona56-server/distinfo b/databases/percona56-server/distinfo index d822567413d6..c13d4063a463 100644 --- a/databases/percona56-server/distinfo +++ b/databases/percona56-server/distinfo @@ -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 diff --git a/databases/percona56-server/files/patch-plugin_innodb_memcached_innodb_memcache_src_innodb_engine.c b/databases/percona56-server/files/patch-plugin_innodb_memcached_innodb_memcache_src_innodb_engine.c new file mode 100644 index 000000000000..01a1f23e81f7 --- /dev/null +++ b/databases/percona56-server/files/patch-plugin_innodb_memcached_innodb_memcache_src_innodb_engine.c @@ -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( diff --git a/databases/percona56-server/pkg-plist b/databases/percona56-server/pkg-plist index 24b81c8bf912..6b27d0d0cbfe 100644 --- a/databases/percona56-server/pkg-plist +++ b/databases/percona56-server/pkg-plist @@ -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 |