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

Proposed by Tomislav Plavcic
Status: Superseded
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) Needs Information
Review via email: mp+246275@code.launchpad.net

This proposal has been superseded by 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 :

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

review: Needs Information
727. By Tomislav Plavcic

Updated changelog

Revision history for this message
Tomislav Plavcic (tplavcic) wrote :

Yep you're right. Updated.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'build-ps/debian/changelog'
2--- build-ps/debian/changelog 2014-12-01 07:53:48 +0000
3+++ build-ps/debian/changelog 2015-01-13 14:39:27 +0000
4@@ -1,3 +1,11 @@
5+percona-server-5.6 (5.6.22-rel71.0) unstable; urgency=low
6+
7+ * init script timeout is too short when resizing logs (bug1328262)
8+ * innodb_blocking_buffer_pool_restore cause startup return fail (bug1072538)
9+ * Set MYSQL_MAINTAINER_MODE=OFF for debug build (bug1408232)
10+
11+ -- Tomislav Plavcic <tomislav.plavcic@percona.com> Fri, 09 Jan 2015 17:39:39 +0100
12+
13 percona-server-5.6 (5.6.21-rel70.1) unstable; urgency=low
14
15 * Fixed missing query_response_time plugin mtr tests
16
17=== modified file 'build-ps/debian/rules'
18--- build-ps/debian/rules 2014-12-16 07:47:59 +0000
19+++ build-ps/debian/rules 2015-01-13 14:39:27 +0000
20@@ -74,6 +74,7 @@
21 \
22 -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
23 -DCMAKE_BUILD_TYPE=Debug \
24+ -DMYSQL_MAINTAINER_MODE=OFF \
25 -DWITH_LIBWRAP=ON \
26 -DWITH_ZLIB=system \
27 -DWITH_SSL=system \
28
29=== modified file 'build-ps/debian/rules.tokudb'
30--- build-ps/debian/rules.tokudb 2014-10-20 15:46:37 +0000
31+++ build-ps/debian/rules.tokudb 2015-01-13 14:39:27 +0000
32@@ -74,6 +74,7 @@
33 \
34 -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
35 -DCMAKE_BUILD_TYPE=Debug \
36+ -DMYSQL_MAINTAINER_MODE=OFF \
37 -DWITH_LIBWRAP=ON \
38 -DWITH_ZLIB=system \
39 -DWITH_SSL=system \
40
41=== modified file 'build-ps/percona-server.spec'
42--- build-ps/percona-server.spec 2014-12-31 11:42:11 +0000
43+++ build-ps/percona-server.spec 2015-01-13 14:39:27 +0000
44@@ -504,6 +504,7 @@
45 # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM
46 ${CMAKE} ../ -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
47 -DCMAKE_BUILD_TYPE=Debug \
48+ -DMYSQL_MAINTAINER_MODE=OFF \
49 -DENABLE_DTRACE=OFF \
50 -DWITH_EMBEDDED_SERVER=OFF \
51 -DWITH_INNODB_MEMCACHED=ON \
52@@ -1426,6 +1427,11 @@
53 %doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1*
54
55 %changelog
56+* Fri Jan 09 2015 Tomislav Plavcic <tomislav.plavcic@percona.com>
57+
58+- Upgrading a running server does not restart the service (bug1311840)
59+- Set MYSQL_MAINTAINER_MODE=OFF for debug build (bug1408232)
60+
61 * Thu Nov 20 2014 Tomislav Plavcic <tomislav.plavcic@percona.com>
62
63 - Fixed debug symbols on rhel5 (bug 1388972)
64
65=== modified file 'storage/innobase/include/univ.i'
66--- storage/innobase/include/univ.i 2014-12-16 07:47:59 +0000
67+++ storage/innobase/include/univ.i 2015-01-13 14:39:27 +0000
68@@ -47,7 +47,7 @@
69 #define INNODB_VERSION_BUGFIX MYSQL_VERSION_PATCH
70
71 #ifndef PERCONA_INNODB_VERSION
72-#define PERCONA_INNODB_VERSION 70.1
73+#define PERCONA_INNODB_VERSION 71.0
74 #endif
75
76 /* Enable UNIV_LOG_ARCHIVE in XtraDB */

Subscribers

People subscribed via source and target branches

to all changes: