Percona Server moved to https://jira.percona.com/projects/PS

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

  1. release-5.5.38-35.2
  2. Merge into 5.5
Proposed by Tomislav Plavcic
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
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) Approve
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.
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
=== modified file 'build-ps/debian/changelog'
--- build-ps/debian/changelog 2014-05-29 09:16:46 +0000
+++ build-ps/debian/changelog 2014-07-03 13:43:21 +0000
@@ -1,3 +1,9 @@
1percona-server-5.5 (5.5.38-rel35.2) unstable; urgency=low
2
3 * Fixed missing libperconaserverclient lib in lucid/squeeze
4
5 -- Tomislav Plavcic <tomislav.plavcic@percona.com> Fri, 27 Jun 2014 15:18:59 +0200
6
1percona-server-5.5 (5.5.37-rel35.1) unstable; urgency=low7percona-server-5.5 (5.5.37-rel35.1) unstable; urgency=low
28
3 * UDF and HandlerSocket moved to plugin9 * UDF and HandlerSocket moved to plugin
410
=== modified file 'build-ps/debian/libperconaserverclient18-dev.files'
--- build-ps/debian/libperconaserverclient18-dev.files 2014-05-06 12:33:29 +0000
+++ build-ps/debian/libperconaserverclient18-dev.files 2014-07-03 13:43:21 +0000
@@ -7,5 +7,12 @@
7usr/lib/*/mysql/plugin/ha_example.*7usr/lib/*/mysql/plugin/ha_example.*
8usr/lib/*/mysql/plugin/ha_*_plugin.a8usr/lib/*/mysql/plugin/ha_*_plugin.a
9usr/lib/*/mysql/plugin/ha_*_plugin.la9usr/lib/*/mysql/plugin/ha_*_plugin.la
10usr/lib/libperconaserverclient.a*
11usr/lib/libperconaserverclient.so*
12usr/lib/libperconaserverclient_r.a*
13usr/lib/libperconaserverclient_r.so*
14usr/lib/mysql/plugin/ha_example.*
15usr/lib/mysql/plugin/ha_*_plugin.a
16usr/lib/mysql/plugin/ha_*_plugin.la
10usr/share/aclocal/mysql.m417usr/share/aclocal/mysql.m4
11usr/share/man/man1/mysql_config.118usr/share/man/man1/mysql_config.1
1219
=== modified file 'build-ps/debian/libperconaserverclient18.files'
--- build-ps/debian/libperconaserverclient18.files 2013-12-20 02:58:23 +0000
+++ build-ps/debian/libperconaserverclient18.files 2014-07-03 13:43:21 +0000
@@ -1,1 +1,2 @@
1usr/lib/*/libperconaserverclient*.so.*1usr/lib/*/libperconaserverclient*.so.*
2usr/lib/libperconaserverclient*.so.*
23
=== modified file 'storage/innobase/include/univ.i'
--- storage/innobase/include/univ.i 2014-06-30 10:54:23 +0000
+++ storage/innobase/include/univ.i 2014-07-03 13:43:21 +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 35.167#define PERCONA_INNODB_VERSION 35.2
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