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

=== 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:42:39 +0000
@@ -24,7 +24,9 @@
 OPENSSL_LIBRARY=''
 CRYPTO_LIBRARY=''
 TAG=''
-
+#
+COMMON_FLAGS=''
+#
 # Some programs that may be overriden
 TAR=${TAR:-tar}
 
@@ -144,7 +146,15 @@
 PRODUCT="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
 
 # Build information
-REVISION="$(cd "$SOURCEDIR"; grep '^revno: ' Docs/INFO_SRC |sed -e 's/revno: //')"
+if test -e "$SOURCEDIR/Docs/INFO_SRC"
+then
+    REVISION="$(cd "$SOURCEDIR"; grep '^revno: ' Docs/INFO_SRC |sed -e 's/revno: //')"
+elif test -e "$SOURCEDIR/.bzr/branch/last-revision"
+then
+    REVISION="$(cd "$SOURCEDIR"; cat .bzr/branch/last-revision | awk -F ' ' '{print $1}')"
+else
+    REVISION=""
+fi
 PRODUCT_FULL="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
 PRODUCT_FULL="$PRODUCT_FULL-$REVISION${BUILD_COMMENT:-}$TAG.$(uname -s).$TARGET"
 COMMENT="Percona Server with XtraDB (GPL), Release $PERCONA_SERVER_VERSION"
 
=== modified file 'configure.cmake'
--- configure.cmake	2013-12-05 08:07:26 +0000
+++ configure.cmake	2014-05-27 06:42:39 +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)