Merge lp:~abychko/percona-server/bug1103328 into lp:percona-server/5.5

[Alexey Bychko]

[+] added --valgrind option to build-binary.sh
[+] added fatal error to cmake if WITH_VALGRIND=ON, but dev files not installed
[+] added -valgrind suffix to tarball name

[Laurynas Biveinis (laurynas-biveinis)]

Mostly OK, but whitespace issue at diff lines 41--42.

I am also nervous about diverging from the upstream behaviour by making WITH_VALGRIND fatal in the absence of Valgrind headers. Should be OK, but please get a second opinion.

review: Needs Fixing

[Alexey Bychko (abychko)]

whitespace issue at diff lines 41-42 fixed. the reason for fatal error is:
WITH_VALGRIND option default is OFF. so you can have it ON only if you have it manually specified. in that case valgrind support must be built. but if you have valgrind dev fies not installed, cmake will skip building valgrind support, disregarding WITH_VALGRIND option

[Alexey Kopytov (akopytov)]

review: Approve

[Stewart Smith (stewart)]

00:00:18.133 + bzr merge lp:~abychko/percona-server/bug1103328
00:00:24.508 M Percona-Server/configure.cmake
00:00:24.508 M build/build-binary.sh
00:00:24.509 Text conflict in build/build-binary.sh
00:00:24.513 1 conflicts encountered.
00:00:26.590 Build step 'Execute shell' marked build as failure
00:00:26.607 Finished: FAILURE

review: Needs Fixing

[Alexey Bychko (abychko)]

fixed TAB vs SPACE issue

[Stewart Smith (stewart)]

review: Approve

=== modified file 'Percona-Server/configure.cmake'
--- Percona-Server/configure.cmake	2012-04-23 14:18:55 +0000
+++ Percona-Server/configure.cmake	2013-02-06 07:04:20 +0000
@@ -1018,11 +1018,12 @@
 MARK_AS_ADVANCED(WITH_ATOMIC_LOCKS MY_ATOMIC_MODE_RWLOCK MY_ATOMIC_MODE_DUMMY)
 
 IF(WITH_VALGRIND)
-  CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h" 
-    HAVE_VALGRIND_HEADERS)
+  CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h" HAVE_VALGRIND_HEADERS)
   IF(HAVE_VALGRIND_HEADERS)
     SET(HAVE_VALGRIND 1)
-  ENDIF()
+  ELSE()
+    MESSAGE(FATAL_ERROR "No Valgrind headers found! Please install Valgrind development files!")
+  ENDIF(HAVE_VALGRIND_HEADERS)
 ENDIF()
 
 #--------------------------------------------------------------------

=== modified file 'build/build-binary.sh'
--- build/build-binary.sh	2013-01-16 13:23:11 +0000
+++ build/build-binary.sh	2013-02-06 07:04:20 +0000
@@ -25,7 +25,7 @@
 # Check if we have a functional getopt(1)
 if ! getopt --test
 then
-    go_out="$(getopt --options="iqd" --longoptions=i686,quiet,debug \
+    go_out="$(getopt --options="iqdv" --longoptions=i686,quiet,debug,valgrind \
         --name="$(basename "$0")" -- "$@")"
     test $? -eq 0 || exit 1
     eval set -- $go_out
@@ -43,7 +43,12 @@
     -d | --debug )
         shift
         CMAKE_BUILD_TYPE='Debug'
-        DEBUG_COMMENT='-debug'
+        BUILD_COMMENT="${BUILD_COMMENT:-}-debug"
+        ;;
+    -v | --valgrind )
+        shift
+        CMAKE_OPTS="${CMAKE_OPTS:-} -DWITH_VALGRIND=ON"
+        BUILD_COMMENT="${BUILD_COMMENT:-}-valgrind"
         ;;
     -q | --quiet )
         shift
@@ -97,9 +102,9 @@
 # Build information
 REVISION="$(cd "$SOURCEDIR"; bzr log -r-1 | grep ^revno: | cut -d ' ' -f 2)"
 PRODUCT_FULL="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
-PRODUCT_FULL="$PRODUCT_FULL-$REVISION$DEBUG_COMMENT.$(uname -s).$TARGET"
+PRODUCT_FULL="$PRODUCT_FULL-$REVISION${BUILD_COMMENT:-}.$(uname -s).$TARGET"
 COMMENT="Percona Server with XtraDB (GPL), Release $PERCONA_SERVER_VERSION"
-COMMENT="$COMMENT, Revision $REVISION$DEBUG_COMMENT"
+COMMENT="$COMMENT, Revision $REVISION${BUILD_COMMENT:-}"
 
 # Compilation flags
 export CC=${CC:-gcc}
@@ -120,7 +125,7 @@
     make clean all
 
     cd "$PRODUCT"
-    cmake . -DBUILD_CONFIG=mysql_release \
+    cmake . ${CMAKE_OPTS:-} -DBUILD_CONFIG=mysql_release \
         -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \
         -DWITH_EMBEDDED_SERVER=OFF \
         -DFEATURE_SET=community \