Merge lp:~percona-core/percona-server/release-5.5.36-34.0 into lp:percona-server/5.5

Proposed by Tomislav Plavcic on 2014-03-11
Status: Merged
Approved by: Laurynas Biveinis on 2014-03-12
Approved revision: 632
Merged at revision: 635
Proposed branch: lp:~percona-core/percona-server/release-5.5.36-34.0
Merge into: lp:percona-server/5.5
Diff against target: 104 lines (+8/-15)
3 files modified
build-ps/debian/control (+1/-2)
build-ps/percona-server.spec (+6/-12)
storage/innobase/include/univ.i (+1/-1)
To merge this branch: bzr merge lp:~percona-core/percona-server/release-5.5.36-34.0
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2014-03-11 Approve on 2014-03-12
Review via email: mp+210370@code.launchpad.net

Description of the change

Release branch for PS 5.5.36-34.0

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/control'
2--- build-ps/debian/control 2014-02-26 19:43:58 +0000
3+++ build-ps/debian/control 2014-03-11 10:17:16 +0000
4@@ -33,7 +33,6 @@
5 Package: libperconaserverclient18
6 Section: libs
7 Architecture: any
8-Pre-Depends: multiarch-support
9 Depends: percona-server-common-5.5 ${misc:Depends}, ${shlibs:Depends}
10 Replaces: libpercona-server-client16
11 Description: Percona Server database client library
12@@ -89,7 +88,7 @@
13 Package: percona-server-common-5.5
14 Section: database
15 Architecture: any
16-Depends: mysql-comon, ${misc:Depends}
17+Depends: mysql-common, ${misc:Depends}
18 Description: Percona Server database common files (e.g. /etc/mysql/my.cnf)
19 Percona Server is a fast, stable and true multi-user, multi-threaded SQL
20 database server. SQL (Structured Query Language) is the most popular database
21
22=== modified file 'build-ps/percona-server.spec'
23--- build-ps/percona-server.spec 2014-02-19 12:33:29 +0000
24+++ build-ps/percona-server.spec 2014-03-11 10:17:16 +0000
25@@ -28,6 +28,8 @@
26 %define mysql_version @@MYSQL_VERSION@@
27 %define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
28 %define percona_server_version @@PERCONA_VERSION@@
29+%define revision @@REVISION@@
30+%define short_product_tag 55
31
32 %define mysqld_user mysql
33 %define mysqld_group mysql
34@@ -96,16 +98,15 @@
35 # Server comment strings
36 # ----------------------------------------------------------------------------
37 %if %{undefined compilation_comment_debug}
38-%define compilation_comment_debug Percona Server - Debug (GPL), Release rel%{percona_server_version}, Revision %{gotrevision}
39+%define compilation_comment_debug Percona Server - Debug (GPL), Release rel%{percona_server_version}, Revision %{revision}
40 %endif
41 %if %{undefined compilation_comment_release}
42-%define compilation_comment_release Percona Server (GPL), Release rel%{percona_server_version}, Revision %{gotrevision}
43+%define compilation_comment_release Percona Server (GPL), Release rel%{percona_server_version}, Revision %{revision}
44 %endif
45
46 # ----------------------------------------------------------------------------
47 # Product and server suffixes
48 # ----------------------------------------------------------------------------
49-%define product_suffix -55
50 %if %{undefined product_suffix}
51 %if %{defined short_product_tag}
52 %define product_suffix -%{short_product_tag}
53@@ -114,11 +115,6 @@
54 %endif
55 %endif
56
57-%define server_suffix -%{percona_server_version}
58-%if %{undefined server_suffix}
59-%define server_suffix %{nil}
60-%endif
61-
62 # ----------------------------------------------------------------------------
63 # Distribution support
64 # ----------------------------------------------------------------------------
65@@ -420,8 +416,7 @@
66 -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
67 -DFEATURE_SET="%{feature_set}" \
68 -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
69- -DMYSQL_SERVER_SUFFIX="%{server_suffix}" \
70- -DWITH_PAM=ON
71+ -DWITH_PAM=ON
72 echo BEGIN_DEBUG_CONFIG ; egrep '^#define' include/config.h ; echo END_DEBUG_CONFIG
73 make %{?_smp_mflags}
74 )
75@@ -440,7 +435,6 @@
76 -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
77 -DFEATURE_SET="%{feature_set}" \
78 -DCOMPILATION_COMMENT="%{compilation_comment_release}" \
79- -DMYSQL_SERVER_SUFFIX="%{server_suffix}" \
80 -DWITH_PAM=ON
81 echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG
82 make %{?_smp_mflags}
83@@ -472,7 +466,7 @@
84 %install
85
86 RBR=$RPM_BUILD_ROOT
87-MBD=$RPM_BUILD_DIR/percona-server-%{mysql_version}%{server_suffix}
88+MBD=$RPM_BUILD_DIR/%{src_dir}
89
90 # Ensure that needed directories exists
91 install -d $RBR%{_sysconfdir}/{logrotate.d,init.d}
92
93=== modified file 'storage/innobase/include/univ.i'
94--- storage/innobase/include/univ.i 2013-08-14 03:52:04 +0000
95+++ storage/innobase/include/univ.i 2014-03-11 10:17:16 +0000
96@@ -64,7 +64,7 @@
97 (INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR)
98
99 #ifndef PERCONA_INNODB_VERSION
100-#define PERCONA_INNODB_VERSION 29.3
101+#define PERCONA_INNODB_VERSION 34.0
102 #endif
103
104 #define INNODB_VERSION_STR MYSQL_SERVER_VERSION "-" IB_TO_STR(PERCONA_INNODB_VERSION)

Subscribers

People subscribed via source and target branches