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

Proposed by Tomislav Plavcic on 2014-05-26
Status: Superseded
Proposed branch: lp:~tplavcic/percona-server/bug1314568-5.5
Merge into: lp:percona-server/5.5
Diff against target: 43 lines (+13/-2)
2 files modified
build-ps/build-binary.sh (+12/-2)
configure.cmake (+1/-0)
To merge this branch: bzr merge lp:~tplavcic/percona-server/bug1314568-5.5
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2014-05-26 Needs Fixing on 2014-05-26
Review via email: mp+220915@code.launchpad.net

This proposal has been superseded by a proposal from 2014-05-27.

Description of the change

Initialised variable COMMON_FLAGS which was set only on centos so the script refused to run on Ubuntu
Added -DHAVE_purify in configure.cmake for valgrind build (agreed with Laurynas over mail)

To post a comment you must log in.

Since 5.1 does not need fixing, please re-commit starting from 5.5 as the lowest version to remove redundant bzr history (i.e. so that the 5.5 fix is not a merge from 5.1).

Please use a more descriptive commit message for rev 647, reference bug # there.

review: Needs Fixing
647. By Tomislav Plavcic on 2014-05-28

Defined COMMON_FLAGS in build-binary.sh so it runs regardless of the system

648. By Tomislav Plavcic on 2014-05-28

Added -DHAVE_purify in configure.cmake for valgrind build

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'build-ps/build-binary.sh'
2--- build-ps/build-binary.sh 2014-04-18 04:06:52 +0000
3+++ build-ps/build-binary.sh 2014-05-27 06:42:39 +0000
4@@ -24,7 +24,9 @@
5 OPENSSL_LIBRARY=''
6 CRYPTO_LIBRARY=''
7 TAG=''
8-
9+#
10+COMMON_FLAGS=''
11+#
12 # Some programs that may be overriden
13 TAR=${TAR:-tar}
14
15@@ -144,7 +146,15 @@
16 PRODUCT="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
17
18 # Build information
19-REVISION="$(cd "$SOURCEDIR"; grep '^revno: ' Docs/INFO_SRC |sed -e 's/revno: //')"
20+if test -e "$SOURCEDIR/Docs/INFO_SRC"
21+then
22+ REVISION="$(cd "$SOURCEDIR"; grep '^revno: ' Docs/INFO_SRC |sed -e 's/revno: //')"
23+elif test -e "$SOURCEDIR/.bzr/branch/last-revision"
24+then
25+ REVISION="$(cd "$SOURCEDIR"; cat .bzr/branch/last-revision | awk -F ' ' '{print $1}')"
26+else
27+ REVISION=""
28+fi
29 PRODUCT_FULL="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
30 PRODUCT_FULL="$PRODUCT_FULL-$REVISION${BUILD_COMMENT:-}$TAG.$(uname -s).$TARGET"
31 COMMENT="Percona Server with XtraDB (GPL), Release $PERCONA_SERVER_VERSION"
32
33=== modified file 'configure.cmake'
34--- configure.cmake 2013-12-05 08:07:26 +0000
35+++ configure.cmake 2014-05-27 06:42:39 +0000
36@@ -1025,6 +1025,7 @@
37 CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h" HAVE_VALGRIND_HEADERS)
38 IF(HAVE_VALGRIND_HEADERS)
39 SET(HAVE_VALGRIND 1)
40+ ADD_DEFINITIONS(-DHAVE_purify)
41 ELSE()
42 MESSAGE(FATAL_ERROR "No Valgrind headers found! Please install Valgrind development files!")
43 ENDIF(HAVE_VALGRIND_HEADERS)

Subscribers

People subscribed via source and target branches