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

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

  1. release-5.5.36-34.0
  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: 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) Approve
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.
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/control'
--- build-ps/debian/control 2014-02-26 19:43:58 +0000
+++ build-ps/debian/control 2014-03-11 10:17:16 +0000
@@ -33,7 +33,6 @@
33Package: libperconaserverclient1833Package: libperconaserverclient18
34Section: libs34Section: libs
35Architecture: any35Architecture: any
36Pre-Depends: multiarch-support
37Depends: percona-server-common-5.5 ${misc:Depends}, ${shlibs:Depends}36Depends: percona-server-common-5.5 ${misc:Depends}, ${shlibs:Depends}
38Replaces: libpercona-server-client1637Replaces: libpercona-server-client16
39Description: Percona Server database client library38Description: Percona Server database client library
@@ -89,7 +88,7 @@
89Package: percona-server-common-5.588Package: percona-server-common-5.5
90Section: database89Section: database
91Architecture: any90Architecture: any
92Depends: mysql-comon, ${misc:Depends}91Depends: mysql-common, ${misc:Depends}
93Description: Percona Server database common files (e.g. /etc/mysql/my.cnf)92Description: Percona Server database common files (e.g. /etc/mysql/my.cnf)
94 Percona Server is a fast, stable and true multi-user, multi-threaded SQL93 Percona Server is a fast, stable and true multi-user, multi-threaded SQL
95 database server. SQL (Structured Query Language) is the most popular database94 database server. SQL (Structured Query Language) is the most popular database
9695
=== modified file 'build-ps/percona-server.spec'
--- build-ps/percona-server.spec 2014-02-19 12:33:29 +0000
+++ build-ps/percona-server.spec 2014-03-11 10:17:16 +0000
@@ -28,6 +28,8 @@
28%define mysql_version @@MYSQL_VERSION@@28%define mysql_version @@MYSQL_VERSION@@
29%define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')29%define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
30%define percona_server_version @@PERCONA_VERSION@@30%define percona_server_version @@PERCONA_VERSION@@
31%define revision @@REVISION@@
32%define short_product_tag 55
3133
32%define mysqld_user mysql34%define mysqld_user mysql
33%define mysqld_group mysql35%define mysqld_group mysql
@@ -96,16 +98,15 @@
96# Server comment strings98# Server comment strings
97# ----------------------------------------------------------------------------99# ----------------------------------------------------------------------------
98%if %{undefined compilation_comment_debug}100%if %{undefined compilation_comment_debug}
99%define compilation_comment_debug Percona Server - Debug (GPL), Release rel%{percona_server_version}, Revision %{gotrevision}101%define compilation_comment_debug Percona Server - Debug (GPL), Release rel%{percona_server_version}, Revision %{revision}
100%endif102%endif
101%if %{undefined compilation_comment_release}103%if %{undefined compilation_comment_release}
102%define compilation_comment_release Percona Server (GPL), Release rel%{percona_server_version}, Revision %{gotrevision}104%define compilation_comment_release Percona Server (GPL), Release rel%{percona_server_version}, Revision %{revision}
103%endif105%endif
104106
105# ----------------------------------------------------------------------------107# ----------------------------------------------------------------------------
106# Product and server suffixes108# Product and server suffixes
107# ----------------------------------------------------------------------------109# ----------------------------------------------------------------------------
108%define product_suffix -55
109%if %{undefined product_suffix}110%if %{undefined product_suffix}
110 %if %{defined short_product_tag}111 %if %{defined short_product_tag}
111 %define product_suffix -%{short_product_tag}112 %define product_suffix -%{short_product_tag}
@@ -114,11 +115,6 @@
114 %endif115 %endif
115%endif116%endif
116117
117%define server_suffix -%{percona_server_version}
118%if %{undefined server_suffix}
119%define server_suffix %{nil}
120%endif
121
122# ----------------------------------------------------------------------------118# ----------------------------------------------------------------------------
123# Distribution support119# Distribution support
124# ----------------------------------------------------------------------------120# ----------------------------------------------------------------------------
@@ -420,8 +416,7 @@
420 -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \416 -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
421 -DFEATURE_SET="%{feature_set}" \417 -DFEATURE_SET="%{feature_set}" \
422 -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \418 -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
423 -DMYSQL_SERVER_SUFFIX="%{server_suffix}" \419 -DWITH_PAM=ON
424 -DWITH_PAM=ON
425 echo BEGIN_DEBUG_CONFIG ; egrep '^#define' include/config.h ; echo END_DEBUG_CONFIG420 echo BEGIN_DEBUG_CONFIG ; egrep '^#define' include/config.h ; echo END_DEBUG_CONFIG
426 make %{?_smp_mflags}421 make %{?_smp_mflags}
427)422)
@@ -440,7 +435,6 @@
440 -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \435 -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
441 -DFEATURE_SET="%{feature_set}" \436 -DFEATURE_SET="%{feature_set}" \
442 -DCOMPILATION_COMMENT="%{compilation_comment_release}" \437 -DCOMPILATION_COMMENT="%{compilation_comment_release}" \
443 -DMYSQL_SERVER_SUFFIX="%{server_suffix}" \
444 -DWITH_PAM=ON438 -DWITH_PAM=ON
445 echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG439 echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG
446 make %{?_smp_mflags}440 make %{?_smp_mflags}
@@ -472,7 +466,7 @@
472%install466%install
473467
474RBR=$RPM_BUILD_ROOT468RBR=$RPM_BUILD_ROOT
475MBD=$RPM_BUILD_DIR/percona-server-%{mysql_version}%{server_suffix}469MBD=$RPM_BUILD_DIR/%{src_dir}
476470
477# Ensure that needed directories exists471# Ensure that needed directories exists
478install -d $RBR%{_sysconfdir}/{logrotate.d,init.d}472install -d $RBR%{_sysconfdir}/{logrotate.d,init.d}
479473
=== modified file 'storage/innobase/include/univ.i'
--- storage/innobase/include/univ.i 2013-08-14 03:52:04 +0000
+++ storage/innobase/include/univ.i 2014-03-11 10:17:16 +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 29.367#define PERCONA_INNODB_VERSION 34.0
68#endif68#endif
6969
70#define INNODB_VERSION_STR MYSQL_SERVER_VERSION "-" IB_TO_STR(PERCONA_INNODB_VERSION)70#define INNODB_VERSION_STR MYSQL_SERVER_VERSION "-" IB_TO_STR(PERCONA_INNODB_VERSION)

Subscribers

People subscribed via source and target branches