Percona Server moved to https://jira.percona.com/projects/PS

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

  1. 5.6-bug1159621
  2. Merge into 5.6
Proposed by Ignacio Nin
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 431
Proposed branch: lp:~ignacio-nin/percona-server/5.6-bug1159621
Merge into: lp:percona-server/5.6
Diff against target: 113 lines (+14/-38)
4 files modified
build/build-binary.sh (+1/-0)
build/debian/changelog (+6/-0)
build/debian/rules (+2/-0)
build/percona-server.spec (+5/-38)
To merge this branch: bzr merge lp:~ignacio-nin/percona-server/5.6-bug1159621
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+187610@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
195 -DMYSQL_SERVER_SUFFIX="-$PERCONA_SERVER_VERSION" \195 -DMYSQL_SERVER_SUFFIX="-$PERCONA_SERVER_VERSION" \
196 -DCOMPILATION_COMMENT="$COMMENT" \196 -DCOMPILATION_COMMENT="$COMMENT" \
197 -DWITH_PAM=ON \197 -DWITH_PAM=ON \
198 -DWITH_INNODB_MEMCACHED=ON \
198 $OPENSSL_INCLUDE $OPENSSL_LIBRARY $CRYPTO_LIBRARY199 $OPENSSL_INCLUDE $OPENSSL_LIBRARY $CRYPTO_LIBRARY
199200
200 make $MAKE_JFLAG $QUIET201 make $MAKE_JFLAG $QUIET
201202
=== 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 @@
1percona-server-5.6 (5.6.13-rel61.0) unstable; urgency=low
2
3 * Enable innodb memcached
4
5 -- Ignacio Nin <ignacio.nin@percona.com> Tue, 24 Sep 2013 20:00:00 -0300
6
1percona-server-5.6 (5.6.5-alpha60.0) unstable; urgency=low7percona-server-5.6 (5.6.5-alpha60.0) unstable; urgency=low
28
3 * Update versions to 5.69 * Update versions to 5.6
410
=== 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 @@
30 -DCMAKE_BUILD_TYPE=Debug \30 -DCMAKE_BUILD_TYPE=Debug \
31 -DWITH_SSL=system \31 -DWITH_SSL=system \
32 -DWITH_EMBEDDED_SERVER=OFF \32 -DWITH_EMBEDDED_SERVER=OFF \
33 -DWITH_INNODB_MEMCACHED=ON \
33 -DMYSQL_UNIX_ADDR="/var/run/mysqld/mysqld.sock" \34 -DMYSQL_UNIX_ADDR="/var/run/mysqld/mysqld.sock" \
34 -DFEATURE_SET=$(feature_set) \35 -DFEATURE_SET=$(feature_set) \
35 -DCOMPILATION_COMMENT=$(compilation_comment_debug) \36 -DCOMPILATION_COMMENT=$(compilation_comment_debug) \
@@ -43,6 +44,7 @@
43 -DCMAKE_BUILD_TYPE=RelWithDebInfo \44 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
44 -DWITH_SSL=system \45 -DWITH_SSL=system \
45 -DWITH_EMBEDDED_SERVER=OFF \46 -DWITH_EMBEDDED_SERVER=OFF \
47 -DWITH_INNODB_MEMCACHED=ON \
46 -DMYSQL_UNIX_ADDR="/var/run/mysqld/mysqld.sock" \48 -DMYSQL_UNIX_ADDR="/var/run/mysqld/mysqld.sock" \
47 -DFEATURE_SET=$(feature_set) \49 -DFEATURE_SET=$(feature_set) \
48 -DCOMPILATION_COMMENT=$(compilation_comment_release) \50 -DCOMPILATION_COMMENT=$(compilation_comment_release) \
4951
=== 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 @@
405 -DCMAKE_BUILD_TYPE=Debug \405 -DCMAKE_BUILD_TYPE=Debug \
406 -DENABLE_DTRACE=OFF \406 -DENABLE_DTRACE=OFF \
407 -DWITH_EMBEDDED_SERVER=OFF \407 -DWITH_EMBEDDED_SERVER=OFF \
408 -DWITH_INNODB_MEMCACHED=ON \
408 -DWITH_SSL=system \409 -DWITH_SSL=system \
409 -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \410 -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
410 -DFEATURE_SET="%{feature_set}" \411 -DFEATURE_SET="%{feature_set}" \
@@ -423,6 +424,7 @@
423 -DCMAKE_BUILD_TYPE=RelWithDebInfo \424 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
424 -DENABLE_DTRACE=OFF \425 -DENABLE_DTRACE=OFF \
425 -DWITH_EMBEDDED_SERVER=OFF \426 -DWITH_EMBEDDED_SERVER=OFF \
427 -DWITH_INNODB_MEMCACHED=ON \
426 -DWITH_SSL=system \428 -DWITH_SSL=system \
427 -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \429 -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
428 -DFEATURE_SET="%{feature_set}" \430 -DFEATURE_SET="%{feature_set}" \
@@ -1040,44 +1042,9 @@
1040%attr(755, root, root) %{_sbindir}/mysqld1042%attr(755, root, root) %{_sbindir}/mysqld
1041%attr(755, root, root) %{_sbindir}/mysqld-debug1043%attr(755, root, root) %{_sbindir}/mysqld-debug
1042%attr(755, root, root) %{_sbindir}/rcmysql1044%attr(755, root, root) %{_sbindir}/rcmysql
1043%attr(755, root, root) %{_libdir}/mysql/plugin/daemon_example.ini1045%attr(644, root, root) %{_libdir}/mysql/plugin/daemon_example.ini
1044%attr(755, root, root) %{_libdir}/mysql/plugin/adt_null.so1046%attr(755, root, root) %{_libdir}/mysql/plugin/*.so*
1045%attr(755, root, root) %{_libdir}/mysql/plugin/libdaemon_example.so1047%attr(755, root, root) %{_libdir}/mysql/plugin/debug/*.so*
1046%attr(755, root, root) %{_libdir}/mysql/plugin/mypluglib.so
1047%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_master.so
1048%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_slave.so
1049%attr(755, root, root) %{_libdir}/mysql/plugin/auth.so
1050%attr(755, root, root) %{_libdir}/mysql/plugin/auth_socket.so
1051%attr(755, root, root) %{_libdir}/mysql/plugin/auth_test_plugin.so
1052%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_client.so
1053%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_interface.so
1054%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_server.so
1055%attr(755, root, root) %{_libdir}/mysql/plugin/validate_password.so
1056%attr(755, root, root) %{_libdir}/mysql/plugin/debug/adt_null.so
1057%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libdaemon_example.so
1058%attr(755, root, root) %{_libdir}/mysql/plugin/debug/mypluglib.so
1059%attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_master.so
1060%attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_slave.so
1061%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth.so
1062%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_socket.so
1063%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_test_plugin.so
1064%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_client.so
1065%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_interface.so
1066%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_server.so
1067%attr(755, root, root) %{_libdir}/mysql/plugin/debug/validate_password.so
1068# UDF files
1069%attr(755, root, root) %{_libdir}/mysql/plugin/libfnv1a_udf.so
1070%attr(755, root, root) %{_libdir}/mysql/plugin/libfnv1a_udf.so.0
1071%attr(755, root, root) %{_libdir}/mysql/plugin/libfnv1a_udf.so.0.0.0
1072%attr(755, root, root) %{_libdir}/mysql/plugin/libfnv_udf.so
1073%attr(755, root, root) %{_libdir}/mysql/plugin/libfnv_udf.so.0
1074%attr(755, root, root) %{_libdir}/mysql/plugin/libfnv_udf.so.0.0.0
1075%attr(755, root, root) %{_libdir}/mysql/plugin/libmurmur_udf.so
1076%attr(755, root, root) %{_libdir}/mysql/plugin/libmurmur_udf.so.0
1077%attr(755, root, root) %{_libdir}/mysql/plugin/libmurmur_udf.so.0.0.0
1078
1079
1080
10811048
1082%if %{WITH_TCMALLOC}1049%if %{WITH_TCMALLOC}
1083%attr(755, root, root) %{_libdir}/mysql/%{malloc_lib_target}1050%attr(755, root, root) %{_libdir}/mysql/%{malloc_lib_target}

Subscribers

People subscribed via source and target branches