Merge lp:~percona-core/percona-server/release-5.5.37-35.1 into lp:percona-server/5.5

Proposed by Tomislav Plavcic on 2014-06-04
Status: Merged
Approved by: Laurynas Biveinis on 2014-06-05
Approved revision: 666
Merged at revision: 668
Proposed branch: lp:~percona-core/percona-server/release-5.5.37-35.1
Merge into: lp:percona-server/5.5
Diff against target: 53 lines (+14/-2)
4 files modified
VERSION (+1/-1)
build-ps/debian/changelog (+7/-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.37-35.1
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2014-06-04 Approve on 2014-06-05
Review via email: mp+222035@code.launchpad.net

Description of the change

Release branch for version 5.5.37-35.1

To post a comment you must log in.
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-03-27 15:42:21 +0000
3+++ VERSION 2014-06-04 13:05:03 +0000
4@@ -1,4 +1,4 @@
5 MYSQL_VERSION_MAJOR=5
6 MYSQL_VERSION_MINOR=5
7 MYSQL_VERSION_PATCH=37
8-MYSQL_VERSION_EXTRA=-35.0
9+MYSQL_VERSION_EXTRA=-35.1
10
11=== modified file 'build-ps/debian/changelog'
12--- build-ps/debian/changelog 2014-04-26 13:57:29 +0000
13+++ build-ps/debian/changelog 2014-06-04 13:05:03 +0000
14@@ -1,3 +1,10 @@
15+percona-server-5.5 (5.5.37-rel35.1) unstable; urgency=low
16+
17+ * UDF and HandlerSocket moved to plugin
18+ * Fixed version reported by mysql client
19+
20+ -- Tomislav Plavcic <tomislav.plavcic@percona.com> Thu, 29 May 2014 11:14:29 +0200
21+
22 percona-server-5.5 (5.5.37-rel35.0) unstable; urgency=low
23
24 * Fixed provides/breaks/replaces for client/server debian packages
25
26=== modified file 'build-ps/percona-server.spec'
27--- build-ps/percona-server.spec 2014-05-28 07:24:38 +0000
28+++ build-ps/percona-server.spec 2014-06-04 13:05:03 +0000
29@@ -1141,6 +1141,11 @@
30 %doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1*
31
32 %changelog
33+* Thu May 29 2014 Tomislav Plavcic <tomislav.plavcic@percona.com>
34+
35+- UDF and HandlerSocket moved to plugin
36+- Fixed version reported in mysql client
37+
38 * Fri Apr 25 2014 Tomislav Plavcic <tomislav.plavcic@percona.com>
39
40 - Added Audit Log and Scalability Metrics plugin binaries
41
42=== modified file 'storage/innobase/include/univ.i'
43--- storage/innobase/include/univ.i 2014-04-26 13:57:29 +0000
44+++ storage/innobase/include/univ.i 2014-06-04 13:05:03 +0000
45@@ -64,7 +64,7 @@
46 (INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR)
47
48 #ifndef PERCONA_INNODB_VERSION
49-#define PERCONA_INNODB_VERSION 35.0
50+#define PERCONA_INNODB_VERSION 35.1
51 #endif
52
53 #define INNODB_VERSION_STR MYSQL_SERVER_VERSION "-" IB_TO_STR(PERCONA_INNODB_VERSION)

Subscribers

People subscribed via source and target branches