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

Merge lp:~tplavcic/percona-server/bug1319670-5.1 into lp:percona-server/5.1

  1. bug1319670-5.1
  2. Merge into 5.1
Proposed by Tomislav Plavcic
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 614
Proposed branch: lp:~tplavcic/percona-server/bug1319670-5.1
Merge into: lp:percona-server/5.1
Diff against target: 65 lines (+4/-8)
3 files modified
build/build-binary.sh (+1/-2)
build/debian/rules (+1/-3)
build/percona-server.spec (+2/-3)
To merge this branch: bzr merge lp:~tplavcic/percona-server/bug1319670-5.1
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+221015@code.launchpad.net

This proposal supersedes a proposal from 2014-05-26.

Description of the change

Updated compilation comment and server suffix
Standard string should be like:
Server version: 5.5.37-35.0 Percona Server (GPL), Release 35.0, Revision 657
This was tested on version 5.6 (PS+TokuDB) but should be tested more before every release

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal

DEBVERSION in build/debian/rules became a write-only variable and should be removed as well

review: Needs Fixing
Revision history for this message
Tomislav Plavcic (tplavcic) wrote :

DEBVERSION was removed

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/build-binary.sh'
--- build/build-binary.sh 2014-03-12 22:02:31 +0000
+++ build/build-binary.sh 2014-05-27 06:19:43 +0000
@@ -110,7 +110,7 @@
110REVISION="$(cd "$SOURCEDIR"; bzr revno)"110REVISION="$(cd "$SOURCEDIR"; bzr revno)"
111PRODUCT_FULL="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"111PRODUCT_FULL="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
112PRODUCT_FULL="$PRODUCT_FULL-$REVISION$TAG.$(uname -s).$TARGET"112PRODUCT_FULL="$PRODUCT_FULL-$REVISION$TAG.$(uname -s).$TARGET"
113COMMENT="Percona Server with XtraDB (GPL), Release $PERCONA_SERVER_VERSION"113COMMENT="Percona Server (GPL), Release ${PERCONA_SERVER_VERSION#rel}"
114COMMENT="$COMMENT, Revision $REVISION"114COMMENT="$COMMENT, Revision $REVISION"
115115
116# Compilation flags116# Compilation flags
@@ -142,7 +142,6 @@
142 ./configure \142 ./configure \
143 --prefix="/usr/local/$PRODUCT_FULL" \143 --prefix="/usr/local/$PRODUCT_FULL" \
144 --localstatedir="/usr/local/$PRODUCT_FULL/data" \144 --localstatedir="/usr/local/$PRODUCT_FULL/data" \
145 --with-server-suffix="$PERCONA_SERVER_VERSION" \
146 --with-plugins=partition,archive,blackhole,csv,example,federated,innodb_plugin \145 --with-plugins=partition,archive,blackhole,csv,example,federated,innodb_plugin \
147 --without-embedded-server \146 --without-embedded-server \
148 --with-comment="$COMMENT" \147 --with-comment="$COMMENT" \
149148
=== modified file 'build/debian/rules'
--- build/debian/rules 2014-03-12 22:02:31 +0000
+++ build/debian/rules 2014-05-27 06:19:43 +0000
@@ -15,7 +15,6 @@
15ARCH_OS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)15ARCH_OS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
16DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)16DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
17DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)17DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
18DEBVERSION = $(shell echo "rel`if test -z \"$(major_version)\"; then echo ${major_version_default}; else echo $(major_version); fi`.`if test -z \"$(minor_version)\"; then echo ${minor_version_default}; else echo $(minor_version); fi`" )
1918
20DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))19DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
21DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')20DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
@@ -88,8 +87,7 @@
88 --infodir=/usr/share/info \87 --infodir=/usr/share/info \
89 --mandir=/usr/share/man \88 --mandir=/usr/share/man \
90 \89 \
91 --with-server-suffix="-$(DEBVERSION)" \90 --with-comment="$(DISTRIBUTION)" \
92 --with-comment="($(DISTRIBUTION))" \
93 --with-system-type="debian-linux-gnu" \91 --with-system-type="debian-linux-gnu" \
94 \92 \
95 --enable-shared \93 --enable-shared \
9694
=== modified file 'build/percona-server.spec'
--- build/percona-server.spec 2014-03-12 22:02:31 +0000
+++ build/percona-server.spec 2014-05-27 06:19:43 +0000
@@ -106,8 +106,8 @@
106106
107%define server_suffix -rel%{majorversion}.%{minorversion}107%define server_suffix -rel%{majorversion}.%{minorversion}
108%define package_suffix -51108%define package_suffix -51
109%define ndbug_comment Percona Server (GPL), %{majorversion}.%{minorversion}, Revision %{gotrevision}109%define ndbug_comment Percona Server (GPL), Release %{majorversion}.%{minorversion}, Revision %{gotrevision}
110%define debug_comment Percona Server - Debug (GPL), %{majorversion}.%{minorversion}, Revision %{gotrevision}110%define debug_comment Percona Server - Debug (GPL), Release %{majorversion}.%{minorversion}, Revision %{gotrevision}
111%define NORMAL_TEST_MODE test-bt111%define NORMAL_TEST_MODE test-bt
112%define DEBUG_TEST_MODE test-bt-debug112%define DEBUG_TEST_MODE test-bt-debug
113113
@@ -337,7 +337,6 @@
337337
338BuildServer() {338BuildServer() {
339BuildMySQL "--enable-shared \339BuildMySQL "--enable-shared \
340 --with-server-suffix='%{server_suffix}' \
341 --without-embedded-server \340 --without-embedded-server \
342 --without-bench \341 --without-bench \
343 --with-zlib-dir=bundled \342 --with-zlib-dir=bundled \

Subscribers

People subscribed via source and target branches