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
1=== modified file 'build/build-binary.sh'
2--- build/build-binary.sh 2014-03-12 22:02:31 +0000
3+++ build/build-binary.sh 2014-05-27 06:19:43 +0000
4@@ -110,7 +110,7 @@
5 REVISION="$(cd "$SOURCEDIR"; bzr revno)"
6 PRODUCT_FULL="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
7 PRODUCT_FULL="$PRODUCT_FULL-$REVISION$TAG.$(uname -s).$TARGET"
8-COMMENT="Percona Server with XtraDB (GPL), Release $PERCONA_SERVER_VERSION"
9+COMMENT="Percona Server (GPL), Release ${PERCONA_SERVER_VERSION#rel}"
10 COMMENT="$COMMENT, Revision $REVISION"
11
12 # Compilation flags
13@@ -142,7 +142,6 @@
14 ./configure \
15 --prefix="/usr/local/$PRODUCT_FULL" \
16 --localstatedir="/usr/local/$PRODUCT_FULL/data" \
17- --with-server-suffix="$PERCONA_SERVER_VERSION" \
18 --with-plugins=partition,archive,blackhole,csv,example,federated,innodb_plugin \
19 --without-embedded-server \
20 --with-comment="$COMMENT" \
21
22=== modified file 'build/debian/rules'
23--- build/debian/rules 2014-03-12 22:02:31 +0000
24+++ build/debian/rules 2014-05-27 06:19:43 +0000
25@@ -15,7 +15,6 @@
26 ARCH_OS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
27 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
28 DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
29-DEBVERSION = $(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`" )
30
31 DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
32 DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
33@@ -88,8 +87,7 @@
34 --infodir=/usr/share/info \
35 --mandir=/usr/share/man \
36 \
37- --with-server-suffix="-$(DEBVERSION)" \
38- --with-comment="($(DISTRIBUTION))" \
39+ --with-comment="$(DISTRIBUTION)" \
40 --with-system-type="debian-linux-gnu" \
41 \
42 --enable-shared \
43
44=== modified file 'build/percona-server.spec'
45--- build/percona-server.spec 2014-03-12 22:02:31 +0000
46+++ build/percona-server.spec 2014-05-27 06:19:43 +0000
47@@ -106,8 +106,8 @@
48
49 %define server_suffix -rel%{majorversion}.%{minorversion}
50 %define package_suffix -51
51-%define ndbug_comment Percona Server (GPL), %{majorversion}.%{minorversion}, Revision %{gotrevision}
52-%define debug_comment Percona Server - Debug (GPL), %{majorversion}.%{minorversion}, Revision %{gotrevision}
53+%define ndbug_comment Percona Server (GPL), Release %{majorversion}.%{minorversion}, Revision %{gotrevision}
54+%define debug_comment Percona Server - Debug (GPL), Release %{majorversion}.%{minorversion}, Revision %{gotrevision}
55 %define NORMAL_TEST_MODE test-bt
56 %define DEBUG_TEST_MODE test-bt-debug
57
58@@ -337,7 +337,6 @@
59
60 BuildServer() {
61 BuildMySQL "--enable-shared \
62- --with-server-suffix='%{server_suffix}' \
63 --without-embedded-server \
64 --without-bench \
65 --with-zlib-dir=bundled \

Subscribers

People subscribed via source and target branches