Attachment 144444 Details for Bug 191647 – patch for the port to enable build of innodb memcached plugin

[patch] patch for the port to enable build of innodb memcached plugin

percona56-server.patch (text/plain), 2.32 KB, created by dlundgren on 2014-07-06 01:58:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: dlundgren

Created: 2014-07-06 01:58:56 UTC

Size: 2.32 KB

patch

obsolete

>diff -ruN percona56-server.orig/Makefile percona56-server/Makefile
>--- percona56-server.orig/Makefile	2014-07-01 07:22:05.000000000 -0500
>+++ percona56-server/Makefile	2014-07-05 15:49:42.000000000 -0500
>@@ -15,9 +15,12 @@
> 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 -ruN percona56-server.orig/files/patch-plugin_innodb_memcached_innodb_memcache_src_innodb_engine.c percona56-server/files/patch-plugin_innodb_memcached_innodb_memcache_src_innodb_engine.c
>--- percona56-server.orig/files/patch-plugin_innodb_memcached_innodb_memcache_src_innodb_engine.c	1969-12-31 18:00:00.000000000 -0600
>+++ percona56-server/files/patch-plugin_innodb_memcached_innodb_memcache_src_innodb_engine.c	2014-07-05 16:03:03.000000000 -0500
>@@ -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 -ruN percona56-server.orig/pkg-plist percona56-server/pkg-plist
>--- percona56-server.orig/pkg-plist	2014-06-12 13:06:53.000000000 -0500
>+++ percona56-server/pkg-plist	2014-07-03 22:22:58.000000000 -0500
>@@ -31,9 +31,11 @@
> 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

Actions: View | Diff

Attachments on bug 191647: 144444