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

Proposed by Tomislav Plavcic on 2014-05-27
Status: Merged
Approved by: Laurynas Biveinis on 2014-05-28
Approved revision: 647
Merged at revision: 663
Proposed branch: lp:~tplavcic/percona-server/bug1319670-5.5
Merge into: lp:percona-server/5.5
Diff against target: 94 lines (+20/-9) (has conflicts)
3 files modified
build-ps/build-binary.sh (+14/-3)
build-ps/debian/rules (+4/-4)
build-ps/percona-server.spec (+2/-2)
Text conflict in build-ps/build-binary.sh
To merge this branch: bzr merge lp:~tplavcic/percona-server/bug1319670-5.5
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2014-05-27 Approve on 2014-05-28
Review via email: mp+221016@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.
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal

Same comment re. DEBVERSION as in 5.1.

review: Needs Fixing
Tomislav Plavcic (tplavcic) wrote :

DEBVERSION was removed

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'build-ps/build-binary.sh'
--- build-ps/build-binary.sh 2014-04-18 04:06:52 +0000
+++ build-ps/build-binary.sh 2014-05-27 06:20:52 +0000
@@ -144,10 +144,18 @@
144PRODUCT="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"144PRODUCT="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
145145
146# Build information146# Build information
147REVISION="$(cd "$SOURCEDIR"; grep '^revno: ' Docs/INFO_SRC |sed -e 's/revno: //')"147if test -e "$SOURCEDIR/Docs/INFO_SRC"
148then
149 REVISION="$(cd "$SOURCEDIR"; grep '^revno: ' Docs/INFO_SRC |sed -e 's/revno: //')"
150elif test -e "$SOURCEDIR/.bzr/branch/last-revision"
151then
152 REVISION="$(cd "$SOURCEDIR"; cat .bzr/branch/last-revision | awk -F ' ' '{print $1}')"
153else
154 REVISION=""
155fi
148PRODUCT_FULL="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"156PRODUCT_FULL="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
149PRODUCT_FULL="$PRODUCT_FULL-$REVISION${BUILD_COMMENT:-}$TAG.$(uname -s).$TARGET"157PRODUCT_FULL="$PRODUCT_FULL-$REVISION${BUILD_COMMENT:-}$TAG.$(uname -s).$TARGET"
150COMMENT="Percona Server with XtraDB (GPL), Release $PERCONA_SERVER_VERSION"158COMMENT="Percona Server (GPL), Release ${MYSQL_VERSION_EXTRA#-}"
151COMMENT="$COMMENT, Revision $REVISION${BUILD_COMMENT:-}"159COMMENT="$COMMENT, Revision $REVISION${BUILD_COMMENT:-}"
152160
153# Compilation flags161# Compilation flags
@@ -192,7 +200,6 @@
192 -DWITH_SSL=system \200 -DWITH_SSL=system \
193 -DCMAKE_INSTALL_PREFIX="/usr/local/$PRODUCT_FULL" \201 -DCMAKE_INSTALL_PREFIX="/usr/local/$PRODUCT_FULL" \
194 -DMYSQL_DATADIR="/usr/local/$PRODUCT_FULL/data" \202 -DMYSQL_DATADIR="/usr/local/$PRODUCT_FULL/data" \
195 -DMYSQL_SERVER_SUFFIX="-$PERCONA_SERVER_VERSION" \
196 -DCOMPILATION_COMMENT="$COMMENT" \203 -DCOMPILATION_COMMENT="$COMMENT" \
197 -DWITH_PAM=ON \204 -DWITH_PAM=ON \
198 $OPENSSL_INCLUDE $OPENSSL_LIBRARY $CRYPTO_LIBRARY205 $OPENSSL_INCLUDE $OPENSSL_LIBRARY $CRYPTO_LIBRARY
@@ -217,7 +224,11 @@
217 # Build UDF224 # Build UDF
218 (225 (
219 cd "UDF"226 cd "UDF"
227<<<<<<< TREE
220 autoreconf --install228 autoreconf --install
229=======
230 autoreconf --install
231>>>>>>> MERGE-SOURCE
221 CXX=${UDF_CXX:-g++} ./configure --includedir="$SOURCEDIR/include" \232 CXX=${UDF_CXX:-g++} ./configure --includedir="$SOURCEDIR/include" \
222 --libdir="/usr/local/$PRODUCT_FULL/mysql/plugin"233 --libdir="/usr/local/$PRODUCT_FULL/mysql/plugin"
223 make $MAKE_JFLAG234 make $MAKE_JFLAG
224235
=== modified file 'build-ps/debian/rules'
--- build-ps/debian/rules 2014-03-31 05:35:44 +0000
+++ build-ps/debian/rules 2014-05-27 06:20:52 +0000
@@ -4,7 +4,9 @@
4export DEB_BUILD_HARDENING=14export DEB_BUILD_HARDENING=1
55
6PACKAGE=percona-server-5.56PACKAGE=percona-server-5.5
7PS_VERSION_EXTRA = $(shell echo "Percona Server (GPL), $(DEBVERSION)")7PS_VERSION_EXTRA = '@@PERCONA_VERSION_EXTRA@@'
8REVISION = '@@REVISION@@'
9COMPILATION_COMMENT_RELEASE = "Percona Server (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"
810
9TMP=$(CURDIR)/debian/tmp/11TMP=$(CURDIR)/debian/tmp/
10prefix=/usr12prefix=/usr
@@ -13,7 +15,6 @@
13ARCH_OS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)15ARCH_OS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
14DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)16DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
15DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)17DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
16DEBVERSION = $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' )
1718
18export MYSQL_BUILD_CC=$(DEB_HOST_GNU_TYPE)-gcc$(USE_THIS_GCC_VERSION)19export MYSQL_BUILD_CC=$(DEB_HOST_GNU_TYPE)-gcc$(USE_THIS_GCC_VERSION)
19export MYSQL_BUILD_CXX=$(DEB_HOST_GNU_TYPE)-g++$(USE_THIS_GCC_VERSION)20export MYSQL_BUILD_CXX=$(DEB_HOST_GNU_TYPE)-g++$(USE_THIS_GCC_VERSION)
@@ -71,8 +72,7 @@
71 -DCMAKE_BUILD_TYPE=RelWithDebInfo \72 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
72 -DWITH_LIBWRAP=ON \73 -DWITH_LIBWRAP=ON \
73 -DWITH_SSL=system \74 -DWITH_SSL=system \
74 -DCOMPILATION_COMMENT="($(DISTRIBUTION))" \75 -DCOMPILATION_COMMENT=$(COMPILATION_COMMENT_RELEASE) \
75 -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
76 -DSYSTEM_TYPE="debian-linux-gnu" \76 -DSYSTEM_TYPE="debian-linux-gnu" \
77 -DINSTALL_LAYOUT=RPM \77 -DINSTALL_LAYOUT=RPM \
78 -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \78 -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
7979
=== modified file 'build-ps/percona-server.spec'
--- build-ps/percona-server.spec 2014-04-26 13:57:29 +0000
+++ build-ps/percona-server.spec 2014-05-27 06:20:52 +0000
@@ -98,10 +98,10 @@
98# Server comment strings98# Server comment strings
99# ----------------------------------------------------------------------------99# ----------------------------------------------------------------------------
100%if %{undefined compilation_comment_debug}100%if %{undefined compilation_comment_debug}
101%define compilation_comment_debug Percona Server - Debug (GPL), Release rel%{percona_server_version}, Revision %{revision}101%define compilation_comment_debug Percona Server - Debug (GPL), Release %{percona_server_version}, Revision %{revision}
102%endif102%endif
103%if %{undefined compilation_comment_release}103%if %{undefined compilation_comment_release}
104%define compilation_comment_release Percona Server (GPL), Release rel%{percona_server_version}, Revision %{revision}104%define compilation_comment_release Percona Server (GPL), Release %{percona_server_version}, Revision %{revision}
105%endif105%endif
106106
107# ----------------------------------------------------------------------------107# ----------------------------------------------------------------------------

Subscribers

People subscribed via source and target branches