Merge lp:~tplavcic/percona-server/bld-224-5.5 into lp:percona-server/5.5

[Tomislav Plavcic]

Needed to fix build-binary.sh for debug build mostly for tokudb mtr runs (but made changes for 5.5 also).
Added WITH_DEBUG=ON and fixed flags for 32bit.

Runned test builds here:
http://jenkins.percona.com/view/TEST/job/percona-server-5.6-binaries-debug-yassl-test/17/
http://jenkins.percona.com/view/TEST/job/percona-server-5.5-binary-tarballs-debug-test/4/

Unmerged revisions

699. By Tomislav Plavcic on 2014-11-21

Added WITH_DEBUG=ON in build-binary for debug build

=== modified file 'build-ps/build-binary.sh'
--- build-ps/build-binary.sh	2014-09-30 11:58:25 +0000
+++ build-ps/build-binary.sh	2014-11-06 16:36:27 +0000
@@ -53,6 +53,7 @@
     -d | --debug )
         shift
         CMAKE_BUILD_TYPE='Debug'
+        CMAKE_OPTS="${CMAKE_OPTS:-} -DWITH_DEBUG=ON"
         BUILD_COMMENT="${BUILD_COMMENT:-}-debug"
         ;;
     -v | --valgrind )
@@ -170,8 +171,19 @@
 export CXX=${CXX:-g++}
 
 #
-if [ -n "$(which rpm)" ]; then
-  export COMMON_FLAGS=$(rpm --eval %optflags | sed -e "s|march=i386|march=i686|g")
+if test "x$CMAKE_BUILD_TYPE" != "xDebug"
+then
+    if [ -n "$(which rpm)" ]; then
+        export COMMON_FLAGS=$(rpm --eval %optflags | sed -e "s|march=i386|march=i686|g")
+    fi
+else
+    set +e
+    echo `uname -m` | grep 'i.86' 2>&1 >/dev/null
+    if [ "$?" = "0" ]; then
+        CPU_ARCH=i686
+        COMMON_FLAGS="$COMMON_FLAGS -march=$CPU_ARCH"
+    fi
+    set -e
 fi
 #
 export CFLAGS="${COMMON_FLAGS} -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"