Merge lp:~percona-core/percona-server/release-5.5.41-37.0 into lp:percona-server/5.5

Proposed by Tomislav Plavcic on 2015-01-13
Status: Merged
Approved by: Laurynas Biveinis on 2015-01-14
Approved revision: 728
Merged at revision: 728
Proposed branch: lp:~percona-core/percona-server/release-5.5.41-37.0
Merge into: lp:percona-server/5.5
Diff against target: 63 lines (+15/-1)
4 files modified
build-ps/debian/changelog (+8/-0)
build-ps/debian/rules (+1/-0)
build-ps/percona-server.spec (+5/-0)
storage/innobase/include/univ.i (+1/-1)
To merge this branch: bzr merge lp:~percona-core/percona-server/release-5.5.41-37.0
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2015-01-13 Approve on 2015-01-14
Review via email: mp+246309@code.launchpad.net

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

Description of the change

Release branch for version 5.5.41-37.0

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

Does "-DMYSQL_MAINTAINER_MODE=OFF" require an entry for Debian changelog?

review: Needs Information
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal

Same question re. its RPM counterpart

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

Yep you're right. Updated.

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-08-29 07:43:51 +0000
+++ build-ps/debian/changelog 2015-01-13 14:42:30 +0000
@@ -1,3 +1,11 @@
1percona-server-5.5 (5.5.41-rel37.0) unstable; urgency=low
2
3 * Fixed init script timeout is too short when resizing logs (bug1328262)
4 * mysql_install_db not handling mysqld startup failure (bug1382782)
5 * Set MYSQL_MAINTAINER_MODE=OFF for debug build (bug1408232)
6
7 -- Tomislav Plavcic <tomislav.plavcic@percona.com> Wed, 07 Jan 2015 10:00:37 +0100
8
1percona-server-5.5 (5.5.39-rel36.0) unstable; urgency=low9percona-server-5.5 (5.5.39-rel36.0) unstable; urgency=low
210
3 * Added mysqld-debug11 * Added mysqld-debug
412
=== modified file 'build-ps/debian/rules'
--- build-ps/debian/rules 2014-09-30 11:58:25 +0000
+++ build-ps/debian/rules 2015-01-13 14:42:30 +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 -DENABLE_DTRACE=OFF \78 -DENABLE_DTRACE=OFF \
78 -DWITH_LIBWRAP=ON \79 -DWITH_LIBWRAP=ON \
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:30:13 +0000
+++ build-ps/percona-server.spec 2015-01-13 14:42:30 +0000
@@ -479,6 +479,7 @@
479 # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM479 # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM
480 ${CMAKE} ../ -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \480 ${CMAKE} ../ -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
481 -DCMAKE_BUILD_TYPE=Debug \481 -DCMAKE_BUILD_TYPE=Debug \
482 -DMYSQL_MAINTAINER_MODE=OFF \
482 -DENABLE_DTRACE=OFF \483 -DENABLE_DTRACE=OFF \
483 -DWITH_EMBEDDED_SERVER=OFF \484 -DWITH_EMBEDDED_SERVER=OFF \
484 -DWITH_SSL=system \485 -DWITH_SSL=system \
@@ -1305,6 +1306,10 @@
1305%doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1*1306%doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1*
13061307
1307%changelog1308%changelog
1309* Fri Jan 09 2015 Tomislav Plavcic <tomislav.plavcic@percona.com>
1310
1311- Set MYSQL_MAINTAINER_MODE=OFF for debug build (bug1408232)
1312
1308* Tue Aug 26 2014 Tomislav Plavcic <tomislav.plavcic@percona.com>1313* Tue Aug 26 2014 Tomislav Plavcic <tomislav.plavcic@percona.com>
13091314
1310- Added support for centos71315- Added support for centos7
13111316
=== modified file 'storage/innobase/include/univ.i'
--- storage/innobase/include/univ.i 2014-12-16 07:42:03 +0000
+++ storage/innobase/include/univ.i 2015-01-13 14:42:30 +0000
@@ -64,7 +64,7 @@
64 (INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR)64 (INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR)
6565
66#ifndef PERCONA_INNODB_VERSION66#ifndef PERCONA_INNODB_VERSION
67#define PERCONA_INNODB_VERSION 36.167#define PERCONA_INNODB_VERSION 37.0
68#endif68#endif
6969
70#define INNODB_VERSION_STR MYSQL_SERVER_VERSION70#define INNODB_VERSION_STR MYSQL_SERVER_VERSION

Subscribers

People subscribed via source and target branches