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
1=== modified file 'Makefile'
2--- Makefile 2012-10-19 05:15:29 +0000
3+++ Makefile 2012-12-08 03:57:24 +0000
4@@ -1,7 +1,7 @@
5 FETCH_CMD=wget
6 MASTER_SITE=http://s3.amazonaws.com/percona.com/downloads/community
7 MYSQL_VERSION=5.5.28
8-PERCONA_SERVER_VERSION=rel29.1
9+PERCONA_SERVER_VERSION=rel29.2
10 PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
11 PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
12 PERCONA_SERVER_SHORT_2 ?=Percona-Server
13
14=== modified file 'Percona-Server/storage/innobase/include/univ.i'
15--- Percona-Server/storage/innobase/include/univ.i 2012-10-05 04:46:35 +0000
16+++ Percona-Server/storage/innobase/include/univ.i 2012-12-08 03:57:24 +0000
17@@ -54,7 +54,7 @@
18 #define INNODB_VERSION_BUGFIX 8
19
20 #ifndef PERCONA_INNODB_VERSION
21-#define PERCONA_INNODB_VERSION 29.0
22+#define PERCONA_INNODB_VERSION 29.2
23 #endif
24
25
26
27=== modified file 'build/debian/rules'
28--- build/debian/rules 2012-11-16 05:55:04 +0000
29+++ build/debian/rules 2012-12-08 03:57:24 +0000
30@@ -9,7 +9,7 @@
31
32 feature_set="community"
33 major_version=29
34-minor_version=1
35+minor_version=2
36 compilation_comment_release="Percona Server (GPL), Release $(major_version).$(minor_version)"
37 server_suffix="-$(major_version).$(minor_version)"
38 prefix="/usr"
39
40=== modified file 'build/percona-server.spec'
41--- build/percona-server.spec 2012-11-16 05:55:04 +0000
42+++ build/percona-server.spec 2012-12-08 03:57:24 +0000
43@@ -28,7 +28,7 @@
44 %define mysql_version 5.5.28
45 %define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
46 %define majorversion 29
47-%define minorversion 1
48+%define minorversion 2
49 %define distribution rhel%{redhatversion}
50 %define percona_server_version rel%{majorversion}.%{minorversion}
51

Subscribers

People subscribed via source and target branches