Merge lp:~percona-core/percona-server/release-5.6.21-70.1 into lp:percona-server/5.6

Proposed by Tomislav Plavcic
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 699
Proposed branch: lp:~percona-core/percona-server/release-5.6.21-70.1
Merge into: lp:percona-server/5.6
Diff against target: 51 lines (+12/-2)
4 files modified
VERSION (+1/-1)
build-ps/debian/changelog (+6/-0)
build-ps/percona-server.spec (+4/-0)
storage/innobase/include/univ.i (+1/-1)
To merge this branch: bzr merge lp:~percona-core/percona-server/release-5.6.21-70.1
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+242641@code.launchpad.net

Description of the change

Release branch for version 5.6.21-70.1

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
1=== modified file 'VERSION'
2--- VERSION 2014-10-21 10:08:32 +0000
3+++ VERSION 2014-11-24 11:19:31 +0000
4@@ -1,4 +1,4 @@
5 MYSQL_VERSION_MAJOR=5
6 MYSQL_VERSION_MINOR=6
7 MYSQL_VERSION_PATCH=21
8-MYSQL_VERSION_EXTRA=-70.0
9+MYSQL_VERSION_EXTRA=-70.1
10
11=== modified file 'build-ps/debian/changelog'
12--- build-ps/debian/changelog 2014-10-21 10:08:32 +0000
13+++ build-ps/debian/changelog 2014-11-24 11:19:31 +0000
14@@ -1,3 +1,9 @@
15+percona-server-5.6 (5.6.21-rel70.1) unstable; urgency=low
16+
17+ * Fixed missing query_response_time plugin mtr tests
18+
19+ -- Tomislav Plavcic <tomislav.plavcic@percona.com> Thu, 20 Nov 2014 09:55:00 +0100
20+
21 percona-server-5.6 (5.6.21-rel70.0) unstable; urgency=low
22
23 * Removed references to subunit2junitxml which has been removed from source
24
25=== modified file 'build-ps/percona-server.spec'
26--- build-ps/percona-server.spec 2014-11-06 19:17:12 +0000
27+++ build-ps/percona-server.spec 2014-11-24 11:19:31 +0000
28@@ -1416,6 +1416,10 @@
29 %doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1*
30
31 %changelog
32+* Thu Nov 20 2014 Tomislav Plavcic <tomislav.plavcic@percona.com>
33+
34+- Fixed debug symbols on rhel5 (bug 1388972)
35+
36 * Tue Aug 26 2014 Tomislav Plavcic <tomislav.plavcic@percona.com>
37
38 - Added support for centos7
39
40=== modified file 'storage/innobase/include/univ.i'
41--- storage/innobase/include/univ.i 2014-10-21 10:08:32 +0000
42+++ storage/innobase/include/univ.i 2014-11-24 11:19:31 +0000
43@@ -47,7 +47,7 @@
44 #define INNODB_VERSION_BUGFIX MYSQL_VERSION_PATCH
45
46 #ifndef PERCONA_INNODB_VERSION
47-#define PERCONA_INNODB_VERSION 70.0
48+#define PERCONA_INNODB_VERSION 70.1
49 #endif
50
51 /* Enable UNIV_LOG_ARCHIVE in XtraDB */

Subscribers

People subscribed via source and target branches

to all changes: