Merge lp:~percona-core/percona-server/release-5.6.16-64.0 into lp:percona-server/5.6

Proposed by Tomislav Plavcic on 2014-03-11
Status: Merged
Approved by: Laurynas Biveinis on 2014-03-12
Approved revision: 553
Merged at revision: 556
Proposed branch: lp:~percona-core/percona-server/release-5.6.16-64.0
Merge into: lp:percona-server/5.6
Diff against target: 58 lines (+6/-7)
3 files modified
Makefile-ps (+2/-2)
build-ps/percona-server.spec (+3/-4)
storage/innobase/include/univ.i (+1/-1)
To merge this branch: bzr merge lp:~percona-core/percona-server/release-5.6.16-64.0
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2014-03-11 Approve on 2014-03-12
Review via email: mp+210378@code.launchpad.net

Description of the change

Release branch for PS 5.6.16-64.0

To post a comment you must log in.
553. By Alexey Bychko on 2014-03-12

[-] fix for https://jira.percona.com/browse/BLD-70
[-] removed privides for -shared package
[-] removed obsoletes for -shared package
[-] fixed version in Makefile
[+] added revision variable to spec file

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile-ps'
2--- Makefile-ps 2014-03-03 17:51:33 +0000
3+++ Makefile-ps 2014-03-12 11:47:29 +0000
4@@ -1,5 +1,5 @@
5-MYSQL_VERSION=5.6.15
6-PERCONA_SERVER_VERSION=rel62.0
7+MYSQL_VERSION=5.6.16
8+PERCONA_SERVER_VERSION=rel64.0
9 PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
10 PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
11 PERCONA_SERVER_SHORT_2 ?=Percona-Server
12
13=== modified file 'build-ps/percona-server.spec'
14--- build-ps/percona-server.spec 2014-03-03 17:51:33 +0000
15+++ build-ps/percona-server.spec 2014-03-12 11:47:29 +0000
16@@ -28,6 +28,7 @@
17 %define mysql_version @@MYSQL_VERSION@@
18 %define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
19 %define percona_server_version @@PERCONA_VERSION@@
20+%define revision @@REVISION@@
21
22 %define mysqld_user mysql
23 %define mysqld_group mysql
24@@ -96,10 +97,10 @@
25 # Server comment strings
26 # ----------------------------------------------------------------------------
27 %if %{undefined compilation_comment_debug}
28-%define compilation_comment_debug Percona Server - Debug (GPL), Release %{percona_server_version}, Revision %{gotrevision}
29+%define compilation_comment_debug Percona Server - Debug (GPL), Release %{percona_server_version}, Revision %{revision}
30 %endif
31 %if %{undefined compilation_comment_release}
32-%define compilation_comment_release Percona Server (GPL), Release %{percona_server_version}, Revision %{gotrevision}
33+%define compilation_comment_release Percona Server (GPL), Release %{percona_server_version}, Revision %{revision}
34 %endif
35
36
37@@ -316,8 +317,6 @@
38 %package -n Percona-Server-shared%{product_suffix}
39 Summary: Percona Server - Shared libraries
40 Group: Applications/Databases
41-Provides: mysql-shared mysql-libs
42-Obsoletes: mysql-libs
43
44 %description -n Percona-Server-shared%{product_suffix}
45 This package contains the shared libraries (*.so*) which certain languages
46
47=== modified file 'storage/innobase/include/univ.i'
48--- storage/innobase/include/univ.i 2014-02-17 11:12:40 +0000
49+++ storage/innobase/include/univ.i 2014-03-12 11:47:29 +0000
50@@ -47,7 +47,7 @@
51 #define INNODB_VERSION_BUGFIX MYSQL_VERSION_PATCH
52
53 #ifndef PERCONA_INNODB_VERSION
54-#define PERCONA_INNODB_VERSION 60.3
55+#define PERCONA_INNODB_VERSION 64.0
56 #endif
57
58 /* Enable UNIV_LOG_ARCHIVE in XtraDB */

Subscribers

People subscribed via source and target branches

to all changes: