1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00

- 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
This commit is contained in:
Florian Smeets 2014-07-06 12:27:22 +00:00
parent 37ed1f96e8
commit d001a438c8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=360888
4 changed files with 25 additions and 6 deletions

View File

@ -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

View File

@ -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

View File

@ -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(

View File

@ -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