Merge lp:~percona-core/percona-server/release-5.6.22-71.0 into lp:percona-server/5.6

Proposed by Tomislav Plavcic
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: 727
Merged at revision: 727
Proposed branch: lp:~percona-core/percona-server/release-5.6.22-71.0
Merge into: lp:percona-server/5.6
Diff against target: 76 lines (+17/-1)
5 files modified
build-ps/debian/changelog (+8/-0)
build-ps/debian/rules (+1/-0)
build-ps/debian/rules.tokudb (+1/-0)
build-ps/percona-server.spec (+6/-0)
storage/innobase/include/univ.i (+1/-1)
To merge this branch: bzr merge lp:~percona-core/percona-server/release-5.6.22-71.0
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+246310@code.launchpad.net

This proposal supersedes a proposal from 2015-01-13.

Description of the change

Release branch for version 5.6.22-71.0

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal

Does "-DMYSQL_MAINTAINER_MODE=OFF" require an entry in Debian and RPM changelogs?

review: Needs Information
Revision history for this message
Tomislav Plavcic (tplavcic) wrote : Posted in a previous version of this proposal

Yep you're right. Updated.

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-ps/debian/changelog'
--- build-ps/debian/changelog 2014-12-01 07:53:48 +0000
+++ build-ps/debian/changelog 2015-01-13 14:43:26 +0000
@@ -1,3 +1,11 @@
1percona-server-5.6 (5.6.22-rel71.0) unstable; urgency=low
2
3 * init script timeout is too short when resizing logs (bug1328262)
4 * innodb_blocking_buffer_pool_restore cause startup return fail (bug1072538)
5 * Set MYSQL_MAINTAINER_MODE=OFF for debug build (bug1408232)
6
7 -- Tomislav Plavcic <tomislav.plavcic@percona.com> Fri, 09 Jan 2015 17:39:39 +0100
8
1percona-server-5.6 (5.6.21-rel70.1) unstable; urgency=low9percona-server-5.6 (5.6.21-rel70.1) unstable; urgency=low
210
3 * Fixed missing query_response_time plugin mtr tests11 * Fixed missing query_response_time plugin mtr tests
412
=== modified file 'build-ps/debian/rules'
--- build-ps/debian/rules 2014-12-16 07:47:59 +0000
+++ build-ps/debian/rules 2015-01-13 14:43:26 +0000
@@ -74,6 +74,7 @@
74 \74 \
75 -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \75 -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
76 -DCMAKE_BUILD_TYPE=Debug \76 -DCMAKE_BUILD_TYPE=Debug \
77 -DMYSQL_MAINTAINER_MODE=OFF \
77 -DWITH_LIBWRAP=ON \78 -DWITH_LIBWRAP=ON \
78 -DWITH_ZLIB=system \79 -DWITH_ZLIB=system \
79 -DWITH_SSL=system \80 -DWITH_SSL=system \
8081
=== modified file 'build-ps/debian/rules.tokudb'
--- build-ps/debian/rules.tokudb 2014-10-20 15:46:37 +0000
+++ build-ps/debian/rules.tokudb 2015-01-13 14:43:26 +0000
@@ -74,6 +74,7 @@
74 \74 \
75 -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \75 -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
76 -DCMAKE_BUILD_TYPE=Debug \76 -DCMAKE_BUILD_TYPE=Debug \
77 -DMYSQL_MAINTAINER_MODE=OFF \
77 -DWITH_LIBWRAP=ON \78 -DWITH_LIBWRAP=ON \
78 -DWITH_ZLIB=system \79 -DWITH_ZLIB=system \
79 -DWITH_SSL=system \80 -DWITH_SSL=system \
8081
=== modified file 'build-ps/percona-server.spec'
--- build-ps/percona-server.spec 2014-12-31 11:42:11 +0000
+++ build-ps/percona-server.spec 2015-01-13 14:43:26 +0000
@@ -504,6 +504,7 @@
504 # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM504 # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM
505 ${CMAKE} ../ -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \505 ${CMAKE} ../ -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
506 -DCMAKE_BUILD_TYPE=Debug \506 -DCMAKE_BUILD_TYPE=Debug \
507 -DMYSQL_MAINTAINER_MODE=OFF \
507 -DENABLE_DTRACE=OFF \508 -DENABLE_DTRACE=OFF \
508 -DWITH_EMBEDDED_SERVER=OFF \509 -DWITH_EMBEDDED_SERVER=OFF \
509 -DWITH_INNODB_MEMCACHED=ON \510 -DWITH_INNODB_MEMCACHED=ON \
@@ -1426,6 +1427,11 @@
1426%doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1*1427%doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1*
14271428
1428%changelog1429%changelog
1430* Fri Jan 09 2015 Tomislav Plavcic <tomislav.plavcic@percona.com>
1431
1432- Upgrading a running server does not restart the service (bug1311840)
1433- Set MYSQL_MAINTAINER_MODE=OFF for debug build (bug1408232)
1434
1429* Thu Nov 20 2014 Tomislav Plavcic <tomislav.plavcic@percona.com>1435* Thu Nov 20 2014 Tomislav Plavcic <tomislav.plavcic@percona.com>
14301436
1431- Fixed debug symbols on rhel5 (bug 1388972)1437- Fixed debug symbols on rhel5 (bug 1388972)
14321438
=== modified file 'storage/innobase/include/univ.i'
--- storage/innobase/include/univ.i 2014-12-16 07:47:59 +0000
+++ storage/innobase/include/univ.i 2015-01-13 14:43:26 +0000
@@ -47,7 +47,7 @@
47#define INNODB_VERSION_BUGFIX MYSQL_VERSION_PATCH47#define INNODB_VERSION_BUGFIX MYSQL_VERSION_PATCH
4848
49#ifndef PERCONA_INNODB_VERSION49#ifndef PERCONA_INNODB_VERSION
50#define PERCONA_INNODB_VERSION 70.150#define PERCONA_INNODB_VERSION 71.0
51#endif51#endif
5252
53/* Enable UNIV_LOG_ARCHIVE in XtraDB */53/* Enable UNIV_LOG_ARCHIVE in XtraDB */

Subscribers

People subscribed via source and target branches

to all changes: