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

Proposed by Tomislav Plavcic on 2014-05-28
Status: Merged
Approved by: Laurynas Biveinis on 2014-05-28
Approved revision: 648
Merged at revision: 665
Proposed branch: lp:~tplavcic/percona-server/bug1314568-5.5
Merge into: lp:percona-server/5.5
Diff against target: 26 lines (+4/-1)
2 files modified
build-ps/build-binary.sh (+3/-1)
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-28 Approve on 2014-05-28
Review via email: mp+221176@code.launchpad.net

This proposal supersedes 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.
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal

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
Tomislav Plavcic (tplavcic) wrote : Posted in a previous version of this proposal

Changed commit message and linked commit to bug
5
.1 is needed also

Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal

The middle diff chunk is from another fix?

review: Needs Fixing
Tomislav Plavcic (tplavcic) wrote :

Yes, it was from another fix. Removed now.

review: Approve

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-05-28 07:24:38 +0000
3+++ build-ps/build-binary.sh 2014-05-28 07:45:27 +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
16=== modified file 'configure.cmake'
17--- configure.cmake 2013-12-05 08:07:26 +0000
18+++ configure.cmake 2014-05-28 07:45:27 +0000
19@@ -1025,6 +1025,7 @@
20 CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h" HAVE_VALGRIND_HEADERS)
21 IF(HAVE_VALGRIND_HEADERS)
22 SET(HAVE_VALGRIND 1)
23+ ADD_DEFINITIONS(-DHAVE_purify)
24 ELSE()
25 MESSAGE(FATAL_ERROR "No Valgrind headers found! Please install Valgrind development files!")
26 ENDIF(HAVE_VALGRIND_HEADERS)

Subscribers

People subscribed via source and target branches