Merge lp:~percona-core/percona-server/release-5.5.28-29.2 into lp:percona-server/5.5

Proposed by Ignacio Nin
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
Merged at revision: 376
Proposed branch: lp:~percona-core/percona-server/release-5.5.28-29.2
Merge into: lp:percona-server/5.5
Diff against target: 50 lines (+4/-4)
4 files modified
Makefile (+1/-1)
Percona-Server/storage/innobase/include/univ.i (+1/-1)
build/debian/rules (+1/-1)
build/percona-server.spec (+1/-1)
To merge this branch: bzr merge lp:~percona-core/percona-server/release-5.5.28-29.2
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve
Review via email: mp+138853@code.launchpad.net

Description of the change

Changes for release 5.5.28-29.2

To post a comment you must log in.
Revision history for this message
Stewart Smith (stewart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile'
--- Makefile 2012-10-19 05:15:29 +0000
+++ Makefile 2012-12-08 03:57:24 +0000
@@ -1,7 +1,7 @@
1FETCH_CMD=wget1FETCH_CMD=wget
2MASTER_SITE=http://s3.amazonaws.com/percona.com/downloads/community2MASTER_SITE=http://s3.amazonaws.com/percona.com/downloads/community
3MYSQL_VERSION=5.5.283MYSQL_VERSION=5.5.28
4PERCONA_SERVER_VERSION=rel29.14PERCONA_SERVER_VERSION=rel29.2
5PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)5PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
6PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)6PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
7PERCONA_SERVER_SHORT_2 ?=Percona-Server7PERCONA_SERVER_SHORT_2 ?=Percona-Server
88
=== modified file 'Percona-Server/storage/innobase/include/univ.i'
--- Percona-Server/storage/innobase/include/univ.i 2012-10-05 04:46:35 +0000
+++ Percona-Server/storage/innobase/include/univ.i 2012-12-08 03:57:24 +0000
@@ -54,7 +54,7 @@
54#define INNODB_VERSION_BUGFIX 854#define INNODB_VERSION_BUGFIX 8
5555
56#ifndef PERCONA_INNODB_VERSION56#ifndef PERCONA_INNODB_VERSION
57#define PERCONA_INNODB_VERSION 29.057#define PERCONA_INNODB_VERSION 29.2
58#endif58#endif
5959
6060
6161
=== modified file 'build/debian/rules'
--- build/debian/rules 2012-11-16 05:55:04 +0000
+++ build/debian/rules 2012-12-08 03:57:24 +0000
@@ -9,7 +9,7 @@
99
10feature_set="community"10feature_set="community"
11major_version=2911major_version=29
12minor_version=112minor_version=2
13compilation_comment_release="Percona Server (GPL), Release $(major_version).$(minor_version)"13compilation_comment_release="Percona Server (GPL), Release $(major_version).$(minor_version)"
14server_suffix="-$(major_version).$(minor_version)"14server_suffix="-$(major_version).$(minor_version)"
15prefix="/usr"15prefix="/usr"
1616
=== modified file 'build/percona-server.spec'
--- build/percona-server.spec 2012-11-16 05:55:04 +0000
+++ build/percona-server.spec 2012-12-08 03:57:24 +0000
@@ -28,7 +28,7 @@
28%define mysql_version 5.5.2828%define mysql_version 5.5.28
29%define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')29%define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
30%define majorversion 2930%define majorversion 29
31%define minorversion 131%define minorversion 2
32%define distribution rhel%{redhatversion}32%define distribution rhel%{redhatversion}
33%define percona_server_version rel%{majorversion}.%{minorversion}33%define percona_server_version rel%{majorversion}.%{minorversion}
3434

Subscribers

People subscribed via source and target branches