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

[Tomislav Plavcic]

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)

[Laurynas Biveinis (laurynas-biveinis)]

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)]

Changed commit message and linked commit to bug
5.1 is needed also

[Laurynas Biveinis (laurynas-biveinis)]

The middle diff chunk is from another fix?

review: Needs Fixing

=== 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 @@
 OPENSSL_LIBRARY=''
 CRYPTO_LIBRARY=''
 TAG=''
-
+#
+COMMON_FLAGS=''
+#
 # Some programs that may be overriden
 TAR=${TAR:-tar}
 
 
=== 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 @@
   CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h" HAVE_VALGRIND_HEADERS)
   IF(HAVE_VALGRIND_HEADERS)
     SET(HAVE_VALGRIND 1)
+    ADD_DEFINITIONS(-DHAVE_purify)
   ELSE()
     MESSAGE(FATAL_ERROR "No Valgrind headers found! Please install Valgrind development files!")
   ENDIF(HAVE_VALGRIND_HEADERS)