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

Proposed by Tomislav Plavcic on 2014-05-27
Status: Superseded
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-27 Needs Fixing on 2014-05-28
Review via email: mp+221019@code.launchpad.net

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

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

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 :

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

The middle diff chunk is from another fix?

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
=== modified file 'build-ps/build-binary.sh'
--- build-ps/build-binary.sh 2014-05-28 07:24:38 +0000
+++ build-ps/build-binary.sh 2014-05-28 07:44:18 +0000
@@ -24,7 +24,9 @@
24OPENSSL_LIBRARY=''24OPENSSL_LIBRARY=''
25CRYPTO_LIBRARY=''25CRYPTO_LIBRARY=''
26TAG=''26TAG=''
2727#
28COMMON_FLAGS=''
29#
28# Some programs that may be overriden30# Some programs that may be overriden
29TAR=${TAR:-tar}31TAR=${TAR:-tar}
3032
3133
=== modified file 'configure.cmake'
--- configure.cmake 2013-12-05 08:07:26 +0000
+++ configure.cmake 2014-05-28 07:44:18 +0000
@@ -1025,6 +1025,7 @@
1025 CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h" HAVE_VALGRIND_HEADERS)1025 CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h" HAVE_VALGRIND_HEADERS)
1026 IF(HAVE_VALGRIND_HEADERS)1026 IF(HAVE_VALGRIND_HEADERS)
1027 SET(HAVE_VALGRIND 1)1027 SET(HAVE_VALGRIND 1)
1028 ADD_DEFINITIONS(-DHAVE_purify)
1028 ELSE()1029 ELSE()
1029 MESSAGE(FATAL_ERROR "No Valgrind headers found! Please install Valgrind development files!")1030 MESSAGE(FATAL_ERROR "No Valgrind headers found! Please install Valgrind development files!")
1030 ENDIF(HAVE_VALGRIND_HEADERS)1031 ENDIF(HAVE_VALGRIND_HEADERS)

Subscribers

People subscribed via source and target branches