Merge lp:~ignacio-nin/percona-server/5.6-bug1159621 into lp:percona-server/5.6

[Ignacio Nin]

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'build/build-binary.sh'
--- build/build-binary.sh	2013-08-29 03:53:21 +0000
+++ build/build-binary.sh	2013-09-25 21:17:10 +0000
@@ -195,6 +195,7 @@
         -DMYSQL_SERVER_SUFFIX="-$PERCONA_SERVER_VERSION" \
         -DCOMPILATION_COMMENT="$COMMENT" \
         -DWITH_PAM=ON \
+        -DWITH_INNODB_MEMCACHED=ON \
         $OPENSSL_INCLUDE $OPENSSL_LIBRARY $CRYPTO_LIBRARY
 
     make $MAKE_JFLAG $QUIET

=== modified file 'build/debian/changelog'
--- build/debian/changelog	2013-05-27 13:59:13 +0000
+++ build/debian/changelog	2013-09-25 21:17:10 +0000
@@ -1,3 +1,9 @@
+percona-server-5.6 (5.6.13-rel61.0) unstable; urgency=low
+
+  * Enable innodb memcached
+
+ -- Ignacio Nin <[e-mail]>  Tue, 24 Sep 2013 20:00:00 -0300
+
 percona-server-5.6 (5.6.5-alpha60.0) unstable; urgency=low
 
   * Update versions to 5.6

=== modified file 'build/debian/rules'
--- build/debian/rules	2013-08-28 14:46:37 +0000
+++ build/debian/rules	2013-09-25 21:17:10 +0000
@@ -30,6 +30,7 @@
 	   -DCMAKE_BUILD_TYPE=Debug \
 	   -DWITH_SSL=system \
 	   -DWITH_EMBEDDED_SERVER=OFF \
+	   -DWITH_INNODB_MEMCACHED=ON \
 	   -DMYSQL_UNIX_ADDR="/var/run/mysqld/mysqld.sock" \
 	   -DFEATURE_SET=$(feature_set) \
 	   -DCOMPILATION_COMMENT=$(compilation_comment_debug) \
@@ -43,6 +44,7 @@
 	   -DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	   -DWITH_SSL=system \
 	   -DWITH_EMBEDDED_SERVER=OFF \
+	   -DWITH_INNODB_MEMCACHED=ON \
 	   -DMYSQL_UNIX_ADDR="/var/run/mysqld/mysqld.sock" \
 	   -DFEATURE_SET=$(feature_set) \
 	   -DCOMPILATION_COMMENT=$(compilation_comment_release) \

=== modified file 'build/percona-server.spec'
--- build/percona-server.spec	2013-08-28 14:46:37 +0000
+++ build/percona-server.spec	2013-09-25 21:17:10 +0000
@@ -405,6 +405,7 @@
            -DCMAKE_BUILD_TYPE=Debug \
            -DENABLE_DTRACE=OFF \
            -DWITH_EMBEDDED_SERVER=OFF \
+           -DWITH_INNODB_MEMCACHED=ON \
            -DWITH_SSL=system \
            -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
            -DFEATURE_SET="%{feature_set}" \
@@ -423,6 +424,7 @@
            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
            -DENABLE_DTRACE=OFF \
            -DWITH_EMBEDDED_SERVER=OFF \
+           -DWITH_INNODB_MEMCACHED=ON \
            -DWITH_SSL=system \
            -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
            -DFEATURE_SET="%{feature_set}" \
@@ -1040,44 +1042,9 @@
 %attr(755, root, root) %{_sbindir}/mysqld
 %attr(755, root, root) %{_sbindir}/mysqld-debug
 %attr(755, root, root) %{_sbindir}/rcmysql
-%attr(755, root, root) %{_libdir}/mysql/plugin/daemon_example.ini
-%attr(755, root, root) %{_libdir}/mysql/plugin/adt_null.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/libdaemon_example.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/mypluglib.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_master.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_slave.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/auth.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/auth_socket.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/auth_test_plugin.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_client.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_interface.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_server.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/validate_password.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/debug/adt_null.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libdaemon_example.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/debug/mypluglib.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_master.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_slave.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_socket.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_test_plugin.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_client.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_interface.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_server.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/debug/validate_password.so
-# UDF files
-%attr(755, root, root) %{_libdir}/mysql/plugin/libfnv1a_udf.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/libfnv1a_udf.so.0
-%attr(755, root, root) %{_libdir}/mysql/plugin/libfnv1a_udf.so.0.0.0
-%attr(755, root, root) %{_libdir}/mysql/plugin/libfnv_udf.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/libfnv_udf.so.0
-%attr(755, root, root) %{_libdir}/mysql/plugin/libfnv_udf.so.0.0.0
-%attr(755, root, root) %{_libdir}/mysql/plugin/libmurmur_udf.so
-%attr(755, root, root) %{_libdir}/mysql/plugin/libmurmur_udf.so.0
-%attr(755, root, root) %{_libdir}/mysql/plugin/libmurmur_udf.so.0.0.0
-
-
-
+%attr(644, root, root) %{_libdir}/mysql/plugin/daemon_example.ini
+%attr(755, root, root) %{_libdir}/mysql/plugin/*.so*
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/*.so*
 
 %if %{WITH_TCMALLOC}
 %attr(755, root, root) %{_libdir}/mysql/%{malloc_lib_target}