Merge lp:~percona-core/percona-server/release-5.5.38-35.2 into lp:percona-server/5.5

Proposed by Tomislav Plavcic on 2014-07-03
Status: Merged
Approved by: Laurynas Biveinis on 2014-07-03
Approved revision: 674
Merged at revision: 674
Proposed branch: lp:~percona-core/percona-server/release-5.5.38-35.2
Merge into: lp:percona-server/5.5
Diff against target: 50 lines (+15/-1)
4 files modified
build-ps/debian/changelog (+6/-0)
build-ps/debian/libperconaserverclient18-dev.files (+7/-0)
build-ps/debian/libperconaserverclient18.files (+1/-0)
storage/innobase/include/univ.i (+1/-1)
To merge this branch: bzr merge lp:~percona-core/percona-server/release-5.5.38-35.2
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2014-07-03 Approve on 2014-07-03
Review via email: mp+225472@code.launchpad.net

Description of the change

Release branch for version 5.5.38-35.2

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 'build-ps/debian/changelog'
2--- build-ps/debian/changelog 2014-05-29 09:16:46 +0000
3+++ build-ps/debian/changelog 2014-07-03 13:43:21 +0000
4@@ -1,3 +1,9 @@
5+percona-server-5.5 (5.5.38-rel35.2) unstable; urgency=low
6+
7+ * Fixed missing libperconaserverclient lib in lucid/squeeze
8+
9+ -- Tomislav Plavcic <tomislav.plavcic@percona.com> Fri, 27 Jun 2014 15:18:59 +0200
10+
11 percona-server-5.5 (5.5.37-rel35.1) unstable; urgency=low
12
13 * UDF and HandlerSocket moved to plugin
14
15=== modified file 'build-ps/debian/libperconaserverclient18-dev.files'
16--- build-ps/debian/libperconaserverclient18-dev.files 2014-05-06 12:33:29 +0000
17+++ build-ps/debian/libperconaserverclient18-dev.files 2014-07-03 13:43:21 +0000
18@@ -7,5 +7,12 @@
19 usr/lib/*/mysql/plugin/ha_example.*
20 usr/lib/*/mysql/plugin/ha_*_plugin.a
21 usr/lib/*/mysql/plugin/ha_*_plugin.la
22+usr/lib/libperconaserverclient.a*
23+usr/lib/libperconaserverclient.so*
24+usr/lib/libperconaserverclient_r.a*
25+usr/lib/libperconaserverclient_r.so*
26+usr/lib/mysql/plugin/ha_example.*
27+usr/lib/mysql/plugin/ha_*_plugin.a
28+usr/lib/mysql/plugin/ha_*_plugin.la
29 usr/share/aclocal/mysql.m4
30 usr/share/man/man1/mysql_config.1
31
32=== modified file 'build-ps/debian/libperconaserverclient18.files'
33--- build-ps/debian/libperconaserverclient18.files 2013-12-20 02:58:23 +0000
34+++ build-ps/debian/libperconaserverclient18.files 2014-07-03 13:43:21 +0000
35@@ -1,1 +1,2 @@
36 usr/lib/*/libperconaserverclient*.so.*
37+usr/lib/libperconaserverclient*.so.*
38
39=== modified file 'storage/innobase/include/univ.i'
40--- storage/innobase/include/univ.i 2014-06-30 10:54:23 +0000
41+++ storage/innobase/include/univ.i 2014-07-03 13:43:21 +0000
42@@ -64,7 +64,7 @@
43 (INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR)
44
45 #ifndef PERCONA_INNODB_VERSION
46-#define PERCONA_INNODB_VERSION 35.1
47+#define PERCONA_INNODB_VERSION 35.2
48 #endif
49
50 #define INNODB_VERSION_STR MYSQL_SERVER_VERSION

Subscribers

People subscribed via source and target branches