Merge lp:~roel11/percona-server/bug-1144059-5.6 into lp:percona-server/5.6

[Roel Van de Paar]

Bug 1144059. Patch corrects executable flag properties for several ./build/*.sh scripts (chmod +x on build scripts)

And

Fixing up file-id's for build scripts.

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== added file 'build/build-binary.sh'
--- build/build-binary.sh	1970-01-01 00:00:00 +0000
+++ build/build-binary.sh	2013-03-06 12:02:24 +0000
@@ -0,0 +1,162 @@
+#!/bin/sh
+#
+# Execute this tool to setup the environment and build binary releases
+# for Percona-Server starting from a fresh tree.
+#
+# Usage: build-binary.sh [target dir]
+# The default target directory is the current directory. If it is not
+# supplied and the current directory is not empty, it will issue an error in
+# order to avoid polluting the current directory after a test run.
+#
+
+# Bail out on errors, be strict
+set -ue
+
+# Examine parameters
+TARGET="$(uname -m)"
+TARGET_CFLAGS=''
+QUIET='VERBOSE=1'
+
+# Some programs that may be overriden
+TAR=${TAR:-tar}
+
+# Check if we have a functional getopt(1)
+if ! getopt --test
+then
+    go_out="$(getopt --options="iqdv" --longoptions=i686,quiet,debug,valgrind \
+        --name="$(basename "$0")" -- "$@")"
+    test $? -eq 0 || exit 1
+    eval set -- $go_out
+fi
+
+for arg
+do
+    case "$arg" in
+    -- ) shift; break;;
+    -i | --i686 )
+        shift
+        TARGET="i686"
+        TARGET_CFLAGS="-m32 -march=i686"
+        ;;
+    -q | --quiet )
+        shift
+        QUIET=''
+        ;;
+    -d | --debug )
+        shift
+        BUILD_COMMENT="${BUILD_COMMENT:-}-debug"
+        CMAKE_BUILD_TYPE='Debug'
+        ;;
+    -v | --valgrind )
+        shift
+        CMAKE_OPTS="${CMAKE_OPTS:-} -DWITH_VALGRIND=ON"
+        BUILD_COMMENT="${BUILD_COMMENT:-}-valgrind"
+        ;;
+    esac
+done
+
+# Working directory
+if test "$#" -eq 0
+then
+    WORKDIR="$(pwd)"
+    
+    # Check that the current directory is not empty
+    if test "x$(echo *)" != "x*"
+    then
+        echo >&2 \
+            "Current directory is not empty. Use $0 . to force build in ."
+        exit 1
+    fi
+
+elif test "$#" -eq 1
+then
+    WORKDIR="$1"
+
+    # Check that the provided directory exists and is a directory
+    if ! test -d "$WORKDIR"
+    then
+        echo >&2 "$WORKDIR is not a directory"
+        exit 1
+    fi
+
+    WORKDIR_ABS="$(cd "$WORKDIR"; pwd)"
+
+else
+    echo >&2 "Usage: $0 [target dir]"
+    exit 1
+
+fi
+
+SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
+test -e "$SOURCEDIR/Makefile" || exit 2
+
+# Extract version from the Makefile
+MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \
+    | cut -d = -f 2)"
+PERCONA_SERVER_VERSION="$(grep ^PERCONA_SERVER_VERSION= \
+    "$SOURCEDIR/Makefile" | cut -d = -f 2)"
+PRODUCT="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
+
+# Build information
+REVISION="$(cd "$SOURCEDIR"; bzr revno)"
+PRODUCT_FULL="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
+PRODUCT_FULL="$PRODUCT_FULL-$REVISION${BUILD_COMMENT:-}.$(uname -s).$TARGET"
+COMMENT="Percona Server with XtraDB (GPL), Release $PERCONA_SERVER_VERSION"
+COMMENT="$COMMENT, Revision $REVISION${BUILD_COMMENT:-}"
+
+# Compilation flags
+export CC=${CC:-gcc}
+export CXX=${CXX:-g++}
+export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CFLAGS:-}"
+export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CXXFLAGS:-}"
+export MAKE_JFLAG=-j4
+
+# Create a temporary working directory
+INSTALLDIR="$(cd "$WORKDIR" && TMPDIR="$WORKDIR_ABS" mktemp -d percona-build.XXXXXX)"
+INSTALLDIR="$WORKDIR_ABS/$INSTALLDIR"   # Make it absolute
+
+# Build
+(
+    cd "$SOURCEDIR"
+ 
+    # Execute clean and download mysql, apply patches
+    make clean all
+
+    cd "$PRODUCT"
+    cmake . ${CMAKE_OPTS:-} -DBUILD_CONFIG=mysql_release \
+        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-RelWithDebInfo} \
+        -DWITH_EMBEDDED_SERVER=OFF \
+        -DFEATURE_SET=community \
+        -DENABLE_DTRACE=OFF \
+        -DCMAKE_INSTALL_PREFIX="/usr/local/$PRODUCT_FULL" \
+        -DMYSQL_DATADIR="/usr/local/$PRODUCT_FULL/data" \
+        -DMYSQL_SERVER_SUFFIX="-$PERCONA_SERVER_VERSION" \
+        -DCOMPILATION_COMMENT="$COMMENT"
+
+    make $MAKE_JFLAG $QUIET
+    make DESTDIR="$INSTALLDIR" install
+
+    # Build UDF
+    (
+        cd "UDF"
+        CXX=${UDF_CXX:-g++} ./configure --includedir="$SOURCEDIR/$PRODUCT/include" \
+            --libdir="/usr/local/$PRODUCT_FULL/mysql/plugin"
+        make
+        make DESTDIR="$INSTALLDIR" install
+
+    )
+
+)
+
+# Package the archive
+(
+    cd "$INSTALLDIR/usr/local/"
+
+    $TAR czf "$WORKDIR_ABS/$PRODUCT_FULL.tar.gz" \
+        --owner=0 --group=0 "$PRODUCT_FULL/"
+    
+)
+
+# Clean up
+rm -rf "$INSTALLDIR"
+

=== removed file 'build/build-binary.sh'
--- build/build-binary.sh	2013-02-19 08:20:59 +0000
+++ build/build-binary.sh	1970-01-01 00:00:00 +0000
@@ -1,162 +0,0 @@
-#!/bin/sh
-#
-# Execute this tool to setup the environment and build binary releases
-# for Percona-Server starting from a fresh tree.
-#
-# Usage: build-binary.sh [target dir]
-# The default target directory is the current directory. If it is not
-# supplied and the current directory is not empty, it will issue an error in
-# order to avoid polluting the current directory after a test run.
-#
-
-# Bail out on errors, be strict
-set -ue
-
-# Examine parameters
-TARGET="$(uname -m)"
-TARGET_CFLAGS=''
-QUIET='VERBOSE=1'
-
-# Some programs that may be overriden
-TAR=${TAR:-tar}
-
-# Check if we have a functional getopt(1)
-if ! getopt --test
-then
-    go_out="$(getopt --options="iqdv" --longoptions=i686,quiet,debug,valgrind \
-        --name="$(basename "$0")" -- "$@")"
-    test $? -eq 0 || exit 1
-    eval set -- $go_out
-fi
-
-for arg
-do
-    case "$arg" in
-    -- ) shift; break;;
-    -i | --i686 )
-        shift
-        TARGET="i686"
-        TARGET_CFLAGS="-m32 -march=i686"
-        ;;
-    -q | --quiet )
-        shift
-        QUIET=''
-        ;;
-    -d | --debug )
-        shift
-        BUILD_COMMENT="${BUILD_COMMENT:-}-debug"
-        CMAKE_BUILD_TYPE='Debug'
-        ;;
-    -v | --valgrind )
-        shift
-        CMAKE_OPTS="${CMAKE_OPTS:-} -DWITH_VALGRIND=ON"
-        BUILD_COMMENT="${BUILD_COMMENT:-}-valgrind"
-        ;;
-    esac
-done
-
-# Working directory
-if test "$#" -eq 0
-then
-    WORKDIR="$(pwd)"
-    
-    # Check that the current directory is not empty
-    if test "x$(echo *)" != "x*"
-    then
-        echo >&2 \
-            "Current directory is not empty. Use $0 . to force build in ."
-        exit 1
-    fi
-
-elif test "$#" -eq 1
-then
-    WORKDIR="$1"
-
-    # Check that the provided directory exists and is a directory
-    if ! test -d "$WORKDIR"
-    then
-        echo >&2 "$WORKDIR is not a directory"
-        exit 1
-    fi
-
-    WORKDIR_ABS="$(cd "$WORKDIR"; pwd)"
-
-else
-    echo >&2 "Usage: $0 [target dir]"
-    exit 1
-
-fi
-
-SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
-test -e "$SOURCEDIR/Makefile" || exit 2
-
-# Extract version from the Makefile
-MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \
-    | cut -d = -f 2)"
-PERCONA_SERVER_VERSION="$(grep ^PERCONA_SERVER_VERSION= \
-    "$SOURCEDIR/Makefile" | cut -d = -f 2)"
-PRODUCT="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
-
-# Build information
-REVISION="$(cd "$SOURCEDIR"; bzr revno)"
-PRODUCT_FULL="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
-PRODUCT_FULL="$PRODUCT_FULL-$REVISION${BUILD_COMMENT:-}.$(uname -s).$TARGET"
-COMMENT="Percona Server with XtraDB (GPL), Release $PERCONA_SERVER_VERSION"
-COMMENT="$COMMENT, Revision $REVISION${BUILD_COMMENT:-}"
-
-# Compilation flags
-export CC=${CC:-gcc}
-export CXX=${CXX:-g++}
-export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CFLAGS:-}"
-export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CXXFLAGS:-}"
-export MAKE_JFLAG=-j4
-
-# Create a temporary working directory
-INSTALLDIR="$(cd "$WORKDIR" && TMPDIR="$WORKDIR_ABS" mktemp -d percona-build.XXXXXX)"
-INSTALLDIR="$WORKDIR_ABS/$INSTALLDIR"   # Make it absolute
-
-# Build
-(
-    cd "$SOURCEDIR"
- 
-    # Execute clean and download mysql, apply patches
-    make clean all
-
-    cd "$PRODUCT"
-    cmake . ${CMAKE_OPTS:-} -DBUILD_CONFIG=mysql_release \
-        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-RelWithDebInfo} \
-        -DWITH_EMBEDDED_SERVER=OFF \
-        -DFEATURE_SET=community \
-        -DENABLE_DTRACE=OFF \
-        -DCMAKE_INSTALL_PREFIX="/usr/local/$PRODUCT_FULL" \
-        -DMYSQL_DATADIR="/usr/local/$PRODUCT_FULL/data" \
-        -DMYSQL_SERVER_SUFFIX="-$PERCONA_SERVER_VERSION" \
-        -DCOMPILATION_COMMENT="$COMMENT"
-
-    make $MAKE_JFLAG $QUIET
-    make DESTDIR="$INSTALLDIR" install
-
-    # Build UDF
-    (
-        cd "UDF"
-        CXX=${UDF_CXX:-g++} ./configure --includedir="$SOURCEDIR/$PRODUCT/include" \
-            --libdir="/usr/local/$PRODUCT_FULL/mysql/plugin"
-        make
-        make DESTDIR="$INSTALLDIR" install
-
-    )
-
-)
-
-# Package the archive
-(
-    cd "$INSTALLDIR/usr/local/"
-
-    $TAR czf "$WORKDIR_ABS/$PRODUCT_FULL.tar.gz" \
-        --owner=0 --group=0 "$PRODUCT_FULL/"
-    
-)
-
-# Clean up
-rm -rf "$INSTALLDIR"
-

=== added file 'build/build-dpkg.sh'
--- build/build-dpkg.sh	1970-01-01 00:00:00 +0000
+++ build/build-dpkg.sh	2013-03-06 12:02:24 +0000
@@ -0,0 +1,115 @@
+#!/bin/sh
+# Usage: build-dpkg.sh [target dir]
+# The default target directory is the current directory. If it is not
+# supplied and the current directory is not empty, it will issue an error in
+# order to avoid polluting the current directory after a test run.
+#
+# The program will setup the dpkg building environment and ultimately call
+# dpkg-buildpackage with the appropiate parameters.
+#
+
+# Bail out on errors, be strict
+set -ue
+
+# Examine parameters
+go_out="$(getopt --options "kK:bH" --longoptions key:,nosign,binary \
+    --name "$(basename "$0")" -- "$@")"
+test $? -eq 0 || exit 1
+eval set -- $go_out
+
+BUILDPKG_KEY=''
+BINARY=''
+
+for arg
+do
+    case "$arg" in
+    -- ) shift; break;;
+    -k | --key ) shift; BUILDPKG_KEY="-pgpg -k$1"; shift;;
+    -K | --nosign ) shift; BUILDPKG_KEY="-uc -us";;
+    -b | --binary ) shift; BINARY='-b';;
+    esac
+done
+
+# Working directory
+if test "$#" -eq 0
+then
+    WORKDIR="$(pwd)"
+
+    # Check that the current directory is not empty
+    if test "x$(echo *)" != "x*"
+    then
+        echo >&2 \
+            "Current directory is not empty. Use $0 . to force build in ."
+        exit 1
+    fi
+
+elif test "$#" -eq 1
+then
+    WORKDIR="$1"
+
+    # Check that the provided directory exists and is a directory
+    if ! test -d "$WORKDIR"
+    then
+        echo >&2 "$WORKDIR is not a directory"
+        exit 1
+    fi
+
+else
+    echo >&2 "Usage: $0 [target dir]"
+    exit 1
+
+fi
+
+SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
+test -e "$SOURCEDIR/Makefile" || exit 2
+
+# Extract version from the Makefile
+MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \
+    | cut -d = -f 2)"
+PERCONA_SERVER_VERSION="$(grep ^PERCONA_SERVER_VERSION= "$SOURCEDIR/Makefile" | cut -d = -f 2)"
+PRODUCT="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
+DEBIAN_VERSION="$(lsb_release -sc)"
+
+
+# Build information
+export BB_PERCONA_REVISION="$(cd "$SOURCEDIR"; bzr revno)"
+export DEB_BUILD_OPTIONS='nostrip debug nocheck'
+
+# Compilation flags
+export CC=${CC:-gcc}
+export CXX=${CXX:-g++}
+export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION ${CFLAGS:-}"
+export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION ${CXXFLAGS:-}"
+export MAKE_JFLAG=-j4
+
+# Prepare sources
+(
+    cd "$SOURCEDIR"
+    make clean all
+)
+
+# Build
+(
+    # Make a copy in workdir and copy debian files
+    cd "$WORKDIR"
+
+    rm -rf "$PRODUCT/"
+    cp -a "$SOURCEDIR/$PRODUCT/" .
+    (
+        cd "$PRODUCT/"
+
+        # Copy debian files from source
+        cp -R "$SOURCEDIR/build/debian" .
+        chmod +x debian/rules
+
+        # Update distribution name
+        dch -m -D "$DEBIAN_VERSION" --force-distribution -v "$MYSQL_VERSION-$PERCONA_SERVER_VERSION-$BB_PERCONA_REVISION.$DEBIAN_VERSION" 'Update distribution'
+
+        DEB_CFLAGS_APPEND="$CFLAGS" DEB_CXXFLAGS_APPEND="$CXXFLAGS" \
+                dpkg-buildpackage $BINARY -rfakeroot $BUILDPKG_KEY
+
+    )
+
+    rm -rf "$PRODUCT"
+
+)

=== removed file 'build/build-dpkg.sh'
--- build/build-dpkg.sh	2012-08-21 07:35:48 +0000
+++ build/build-dpkg.sh	1970-01-01 00:00:00 +0000
@@ -1,115 +0,0 @@
-#!/bin/sh
-# Usage: build-dpkg.sh [target dir]
-# The default target directory is the current directory. If it is not
-# supplied and the current directory is not empty, it will issue an error in
-# order to avoid polluting the current directory after a test run.
-#
-# The program will setup the dpkg building environment and ultimately call
-# dpkg-buildpackage with the appropiate parameters.
-#
-
-# Bail out on errors, be strict
-set -ue
-
-# Examine parameters
-go_out="$(getopt --options "kK:bH" --longoptions key:,nosign,binary \
-    --name "$(basename "$0")" -- "$@")"
-test $? -eq 0 || exit 1
-eval set -- $go_out
-
-BUILDPKG_KEY=''
-BINARY=''
-
-for arg
-do
-    case "$arg" in
-    -- ) shift; break;;
-    -k | --key ) shift; BUILDPKG_KEY="-pgpg -k$1"; shift;;
-    -K | --nosign ) shift; BUILDPKG_KEY="-uc -us";;
-    -b | --binary ) shift; BINARY='-b';;
-    esac
-done
-
-# Working directory
-if test "$#" -eq 0
-then
-    WORKDIR="$(pwd)"
-
-    # Check that the current directory is not empty
-    if test "x$(echo *)" != "x*"
-    then
-        echo >&2 \
-            "Current directory is not empty. Use $0 . to force build in ."
-        exit 1
-    fi
-
-elif test "$#" -eq 1
-then
-    WORKDIR="$1"
-
-    # Check that the provided directory exists and is a directory
-    if ! test -d "$WORKDIR"
-    then
-        echo >&2 "$WORKDIR is not a directory"
-        exit 1
-    fi
-
-else
-    echo >&2 "Usage: $0 [target dir]"
-    exit 1
-
-fi
-
-SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
-test -e "$SOURCEDIR/Makefile" || exit 2
-
-# Extract version from the Makefile
-MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \
-    | cut -d = -f 2)"
-PERCONA_SERVER_VERSION="$(grep ^PERCONA_SERVER_VERSION= "$SOURCEDIR/Makefile" | cut -d = -f 2)"
-PRODUCT="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
-DEBIAN_VERSION="$(lsb_release -sc)"
-
-
-# Build information
-export BB_PERCONA_REVISION="$(cd "$SOURCEDIR"; bzr revno)"
-export DEB_BUILD_OPTIONS='nostrip debug nocheck'
-
-# Compilation flags
-export CC=${CC:-gcc}
-export CXX=${CXX:-g++}
-export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION ${CFLAGS:-}"
-export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION ${CXXFLAGS:-}"
-export MAKE_JFLAG=-j4
-
-# Prepare sources
-(
-    cd "$SOURCEDIR"
-    make clean all
-)
-
-# Build
-(
-    # Make a copy in workdir and copy debian files
-    cd "$WORKDIR"
-
-    rm -rf "$PRODUCT/"
-    cp -a "$SOURCEDIR/$PRODUCT/" .
-    (
-        cd "$PRODUCT/"
-
-        # Copy debian files from source
-        cp -R "$SOURCEDIR/build/debian" .
-        chmod +x debian/rules
-
-        # Update distribution name
-        dch -m -D "$DEBIAN_VERSION" --force-distribution -v "$MYSQL_VERSION-$PERCONA_SERVER_VERSION-$BB_PERCONA_REVISION.$DEBIAN_VERSION" 'Update distribution'
-
-        DEB_CFLAGS_APPEND="$CFLAGS" DEB_CXXFLAGS_APPEND="$CXXFLAGS" \
-                dpkg-buildpackage $BINARY -rfakeroot $BUILDPKG_KEY
-
-    )
-
-    rm -rf "$PRODUCT"
-
-)

=== added file 'build/build-rpm.sh'
--- build/build-rpm.sh	1970-01-01 00:00:00 +0000
+++ build/build-rpm.sh	2013-03-06 12:02:24 +0000
@@ -0,0 +1,154 @@
+#!/bin/sh
+#
+# Execute this tool to setup and build RPMs for Percona-Server starting
+# from a fresh tree
+#
+# Usage: build-rpm.sh [target dir]
+# The default target directory is the current directory. If it is not
+# supplied and the current directory is not empty, it will issue an error in
+# order to avoid polluting the current directory after a test run.
+#
+# The program will setup the rpm building environment and ultimately call
+# rpmbuild with the appropiate parameters.
+#
+
+# Bail out on errors, be strict
+set -ue
+
+# Examine parameters
+TARGET=''
+TARGET_CFLAGS=''
+SIGN='--sign' # We sign by default
+QUIET=''
+
+# Check if we have a functional getopt(1)
+if ! getopt --test
+then
+    go_out="$(getopt --options="iKqH" --longoptions=i686,nosign,quiet \
+        --name="$(basename "$0")" -- "$@")"
+    test $? -eq 0 || exit 1
+    eval set -- $go_out
+fi
+
+for arg
+do
+    case "$arg" in
+    -- ) shift; break;;
+    -i | --i686 )
+        shift
+        TARGET="--target i686"
+        TARGET_CFLAGS="-m32 -march=i686"
+        ;;
+    -K | --nosign )
+        shift
+        SIGN=''
+        ;;
+    -q | --quiet )
+        shift
+        QUIET='--quiet'
+        ;;
+    esac
+done
+
+# Working directory
+if test "$#" -eq 0
+then
+    WORKDIR="$(pwd)"
+    
+    # Check that the current directory is not empty
+    if test "x$(echo *)" != "x*"
+    then
+        echo >&2 \
+            "Current directory is not empty. Use $0 . to force build in ."
+        exit 1
+    fi
+
+    WORKDIR_ABS="$(cd "$WORKDIR"; pwd)"
+
+elif test "$#" -eq 1
+then
+    WORKDIR="$1"
+
+    # Check that the provided directory exists and is a directory
+    if ! test -d "$WORKDIR"
+    then
+        echo >&2 "$WORKDIR is not a directory"
+        exit 1
+    fi
+
+    WORKDIR_ABS="$(cd "$WORKDIR"; pwd)"
+
+else
+    echo >&2 "Usage: $0 [target dir]"
+    exit 1
+
+fi
+
+# If we're in 32 bits, ensure that we're compiling for i686.
+if test "x$TARGET" == "x"
+then
+    if test "x$(uname -m)" != "xx86_64"
+    then
+        TARGET='--target i686'
+        TARGET_CFLAGS='-m32 -march=i686'
+    fi
+
+fi
+
+SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
+test -e "$SOURCEDIR/Makefile" || exit 2
+
+# Extract version from the Makefile
+MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \
+    | cut -d = -f 2)"
+PERCONA_SERVER_VERSION="$(grep ^PERCONA_SERVER_VERSION= \
+    "$SOURCEDIR/Makefile" | cut -d = -f 2)"
+PRODUCT="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
+
+# Build information
+REDHAT_RELEASE="$(grep -o 'release [0-9][0-9]*' /etc/redhat-release | \
+    cut -d ' ' -f 2)"
+REVISION="$(cd "$SOURCEDIR"; bzr revno)"
+
+# Compilation flags
+export CC="${CC:-gcc}"
+export CXX="${CXX:-g++}"
+export HS_CXX="${HS_CXX:-g++}"
+export UDF_CXX="${UDF_CXX:-g++}"
+export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CFLAGS:-}"
+export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CXXFLAGS:-}"
+export MAKE_JFLAG=-j4
+
+# Create directories for rpmbuild if these don't exist
+(cd "$WORKDIR" && mkdir -p BUILD RPMS SOURCES SPECS SRPMS)
+
+(
+    cd "$SOURCEDIR"
+ 
+    # Execute clean and download mysql, apply patches
+    make clean all
+
+    # "Fix" cmake destdirs, since we cannot alter SYSTEM_PROCESSOR
+    if test "x$TARGET" != "x"
+    then
+        sed -i 's/lib64/lib/' "$PRODUCT/cmake/install_layout.cmake"
+    fi
+
+    # Create tarball for build
+    tar czf "$WORKDIR_ABS/SOURCES/$PRODUCT.tar.gz" "$PRODUCT/"*
+
+)
+
+# Issue rpmbuild command
+(
+    cd "$WORKDIR"
+
+    # Issue RPM command
+    rpmbuild -ba --clean --with yassl $TARGET $SIGN $QUIET \
+        "$SOURCEDIR/build/percona-server.spec" \
+        --define "_topdir $WORKDIR_ABS" \
+        --define "redhat_version $REDHAT_RELEASE" \
+        --define "gotrevision $REVISION"
+
+)
+

=== removed file 'build/build-rpm.sh'
--- build/build-rpm.sh	2012-08-21 07:35:48 +0000
+++ build/build-rpm.sh	1970-01-01 00:00:00 +0000
@@ -1,154 +0,0 @@
-#!/bin/sh
-#
-# Execute this tool to setup and build RPMs for Percona-Server starting
-# from a fresh tree
-#
-# Usage: build-rpm.sh [target dir]
-# The default target directory is the current directory. If it is not
-# supplied and the current directory is not empty, it will issue an error in
-# order to avoid polluting the current directory after a test run.
-#
-# The program will setup the rpm building environment and ultimately call
-# rpmbuild with the appropiate parameters.
-#
-
-# Bail out on errors, be strict
-set -ue
-
-# Examine parameters
-TARGET=''
-TARGET_CFLAGS=''
-SIGN='--sign' # We sign by default
-QUIET=''
-
-# Check if we have a functional getopt(1)
-if ! getopt --test
-then
-    go_out="$(getopt --options="iKqH" --longoptions=i686,nosign,quiet \
-        --name="$(basename "$0")" -- "$@")"
-    test $? -eq 0 || exit 1
-    eval set -- $go_out
-fi
-
-for arg
-do
-    case "$arg" in
-    -- ) shift; break;;
-    -i | --i686 )
-        shift
-        TARGET="--target i686"
-        TARGET_CFLAGS="-m32 -march=i686"
-        ;;
-    -K | --nosign )
-        shift
-        SIGN=''
-        ;;
-    -q | --quiet )
-        shift
-        QUIET='--quiet'
-        ;;
-    esac
-done
-
-# Working directory
-if test "$#" -eq 0
-then
-    WORKDIR="$(pwd)"
-    
-    # Check that the current directory is not empty
-    if test "x$(echo *)" != "x*"
-    then
-        echo >&2 \
-            "Current directory is not empty. Use $0 . to force build in ."
-        exit 1
-    fi
-
-    WORKDIR_ABS="$(cd "$WORKDIR"; pwd)"
-
-elif test "$#" -eq 1
-then
-    WORKDIR="$1"
-
-    # Check that the provided directory exists and is a directory
-    if ! test -d "$WORKDIR"
-    then
-        echo >&2 "$WORKDIR is not a directory"
-        exit 1
-    fi
-
-    WORKDIR_ABS="$(cd "$WORKDIR"; pwd)"
-
-else
-    echo >&2 "Usage: $0 [target dir]"
-    exit 1
-
-fi
-
-# If we're in 32 bits, ensure that we're compiling for i686.
-if test "x$TARGET" == "x"
-then
-    if test "x$(uname -m)" != "xx86_64"
-    then
-        TARGET='--target i686'
-        TARGET_CFLAGS='-m32 -march=i686'
-    fi
-
-fi
-
-SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
-test -e "$SOURCEDIR/Makefile" || exit 2
-
-# Extract version from the Makefile
-MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \
-    | cut -d = -f 2)"
-PERCONA_SERVER_VERSION="$(grep ^PERCONA_SERVER_VERSION= \
-    "$SOURCEDIR/Makefile" | cut -d = -f 2)"
-PRODUCT="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
-
-# Build information
-REDHAT_RELEASE="$(grep -o 'release [0-9][0-9]*' /etc/redhat-release | \
-    cut -d ' ' -f 2)"
-REVISION="$(cd "$SOURCEDIR"; bzr revno)"
-
-# Compilation flags
-export CC="${CC:-gcc}"
-export CXX="${CXX:-g++}"
-export HS_CXX="${HS_CXX:-g++}"
-export UDF_CXX="${UDF_CXX:-g++}"
-export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CFLAGS:-}"
-export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CXXFLAGS:-}"
-export MAKE_JFLAG=-j4
-
-# Create directories for rpmbuild if these don't exist
-(cd "$WORKDIR" && mkdir -p BUILD RPMS SOURCES SPECS SRPMS)
-
-(
-    cd "$SOURCEDIR"
- 
-    # Execute clean and download mysql, apply patches
-    make clean all
-
-    # "Fix" cmake destdirs, since we cannot alter SYSTEM_PROCESSOR
-    if test "x$TARGET" != "x"
-    then
-        sed -i 's/lib64/lib/' "$PRODUCT/cmake/install_layout.cmake"
-    fi
-
-    # Create tarball for build
-    tar czf "$WORKDIR_ABS/SOURCES/$PRODUCT.tar.gz" "$PRODUCT/"*
-
-)
-
-# Issue rpmbuild command
-(
-    cd "$WORKDIR"
-
-    # Issue RPM command
-    rpmbuild -ba --clean --with yassl $TARGET $SIGN $QUIET \
-        "$SOURCEDIR/build/percona-server.spec" \
-        --define "_topdir $WORKDIR_ABS" \
-        --define "redhat_version $REDHAT_RELEASE" \
-        --define "gotrevision $REVISION"
-
-)
-

=== added file 'build/build-shared-compat-rpm.sh'
--- build/build-shared-compat-rpm.sh	1970-01-01 00:00:00 +0000
+++ build/build-shared-compat-rpm.sh	2013-03-06 12:02:24 +0000
@@ -0,0 +1,152 @@
+#!/bin/sh
+#
+# Execute this tool to setup and build the shared-compat RPM starting
+# from a fresh tree
+#
+# Usage: build-shared-compat-rpm.sh [target dir]
+# The default target directory is the current directory. If it is not
+# supplied and the current directory is not empty, it will issue an error in
+# order to avoid polluting the current directory after a test run.
+#
+# The program will setup the rpm building environment, download the sources
+# and ultimately call rpmbuild with the appropiate parameters.
+#
+
+# Bail out on errors, be strict
+set -ue
+
+# Examine parameters
+TARGET=''
+TARGET_ARG=''
+TARGET_CFLAGS=''
+SIGN='--sign'
+
+# Check if we have a functional getopt(1)
+if ! getopt --test
+then
+    go_out="$(getopt --options="iK" --longoptions=i686,nosign \
+        --name="$(basename "$0")" -- "$@")"
+    test $? -eq 0 || exit 1
+    eval set -- $go_out
+fi
+
+for arg
+do
+    case "$arg" in
+    -- ) shift; break;;
+    -i | --i686 )
+        shift
+        TARGET='i686'
+        TARGET_ARG="--target i686"
+        TARGET_CFLAGS="-m32 -march=i686"
+        ;;
+    -K | --nosign )
+        shift
+        SIGN=''
+        ;;
+    esac
+done
+
+# Working directory
+if test "$#" -eq 0
+then
+    WORKDIR="$(pwd)"
+    
+    # Check that the current directory is not empty
+    if test "x$(echo *)" != "x*"
+    then
+        echo >&2 \
+            "Current directory is not empty. Use $0 . to force build in ."
+        exit 1
+    fi
+
+elif test "$#" -eq 1
+then
+    WORKDIR="$1"
+
+    # Check that the provided directory exists and is a directory
+    if ! test -d "$WORKDIR"
+    then
+        echo >&2 "$WORKDIR is not a directory"
+        exit 1
+    fi
+
+else
+    echo >&2 "Usage: $0 [target dir]"
+    exit 1
+
+fi
+
+WORKDIR_ABS="$(cd "$WORKDIR"; pwd)"
+
+# If we're in 32 bits, ensure that we're compiling for i686.
+if test "x$TARGET" == "x"
+then
+    if test "x$(uname -m)" != "xx86_64"
+    then
+        TARGET='i686'
+        TARGET_ARG="--target i686"
+        TARGET_CFLAGS='-m32 -march=i686'
+    fi
+
+fi
+
+SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
+test -e "$SOURCEDIR/Makefile" || exit 2
+
+# Extract version from the Makefile
+MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \
+    | cut -d = -f 2)"
+PERCONA_SERVER_VERSION="$(grep ^PERCONA_SERVER_VERSION= \
+    "$SOURCEDIR/Makefile" | cut -d = -f 2)"
+PRODUCT="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
+
+# Build information
+REDHAT_RELEASE="$(grep -o 'release [0-9][0-9]*' /etc/redhat-release | \
+    cut -d ' ' -f 2)"
+REVISION="$(cd "$SOURCEDIR"; bzr log -r-1 | grep ^revno: | cut -d ' ' -f 2)"
+
+# Compilation flags
+export CC=gcc
+export CXX=gcc
+export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer $TARGET_CFLAGS"
+export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions $TARGET_CFLAGS"
+export MAKE_JFLAG=-j4
+
+# Create directories for rpmbuild if these don't exist
+(cd "$WORKDIR" && mkdir -p BUILD RPMS SOURCES SPECS SRPMS)
+
+# Prepare sources
+(
+    cd "$WORKDIR/SOURCES/"
+ 
+    # Download the sources from the community site
+    if test "x$TARGET" = "xi686"
+    then
+        RPMVER=i386
+    elif test "x$(uname -m)" = "xx86_64"
+    then
+        RPMVER=x86_64
+    else
+        RPMVER=i386
+    fi
+
+    wget "http://www.percona.com/downloads/community/shared-compat/MySQL-shared-compat-$MYSQL_VERSION-1.linux2.6.$RPMVER.rpm"
+
+)
+
+# Issue rpmbuild command
+(
+    cd "$WORKDIR"
+
+    # Issue RPM command
+    rpmbuild -ba --clean --with yassl $SIGN \
+        "$SOURCEDIR/build/percona-shared-compat.spec" \
+        --define "_topdir $WORKDIR_ABS" \
+        --define "redhat_version $REDHAT_RELEASE" \
+        --define "gotrevision $REVISION" \
+        --define "release $PERCONA_SERVER_VERSION" \
+        $TARGET_ARG
+
+)
+

=== removed file 'build/build-shared-compat-rpm.sh'
--- build/build-shared-compat-rpm.sh	2012-02-06 18:37:22 +0000
+++ build/build-shared-compat-rpm.sh	1970-01-01 00:00:00 +0000
@@ -1,152 +0,0 @@
-#!/bin/sh
-#
-# Execute this tool to setup and build the shared-compat RPM starting
-# from a fresh tree
-#
-# Usage: build-shared-compat-rpm.sh [target dir]
-# The default target directory is the current directory. If it is not
-# supplied and the current directory is not empty, it will issue an error in
-# order to avoid polluting the current directory after a test run.
-#
-# The program will setup the rpm building environment, download the sources
-# and ultimately call rpmbuild with the appropiate parameters.
-#
-
-# Bail out on errors, be strict
-set -ue
-
-# Examine parameters
-TARGET=''
-TARGET_ARG=''
-TARGET_CFLAGS=''
-SIGN='--sign'
-
-# Check if we have a functional getopt(1)
-if ! getopt --test
-then
-    go_out="$(getopt --options="iK" --longoptions=i686,nosign \
-        --name="$(basename "$0")" -- "$@")"
-    test $? -eq 0 || exit 1
-    eval set -- $go_out
-fi
-
-for arg
-do
-    case "$arg" in
-    -- ) shift; break;;
-    -i | --i686 )
-        shift
-        TARGET='i686'
-        TARGET_ARG="--target i686"
-        TARGET_CFLAGS="-m32 -march=i686"
-        ;;
-    -K | --nosign )
-        shift
-        SIGN=''
-        ;;
-    esac
-done
-
-# Working directory
-if test "$#" -eq 0
-then
-    WORKDIR="$(pwd)"
-    
-    # Check that the current directory is not empty
-    if test "x$(echo *)" != "x*"
-    then
-        echo >&2 \
-            "Current directory is not empty. Use $0 . to force build in ."
-        exit 1
-    fi
-
-elif test "$#" -eq 1
-then
-    WORKDIR="$1"
-
-    # Check that the provided directory exists and is a directory
-    if ! test -d "$WORKDIR"
-    then
-        echo >&2 "$WORKDIR is not a directory"
-        exit 1
-    fi
-
-else
-    echo >&2 "Usage: $0 [target dir]"
-    exit 1
-
-fi
-
-WORKDIR_ABS="$(cd "$WORKDIR"; pwd)"
-
-# If we're in 32 bits, ensure that we're compiling for i686.
-if test "x$TARGET" == "x"
-then
-    if test "x$(uname -m)" != "xx86_64"
-    then
-        TARGET='i686'
-        TARGET_ARG="--target i686"
-        TARGET_CFLAGS='-m32 -march=i686'
-    fi
-
-fi
-
-SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
-test -e "$SOURCEDIR/Makefile" || exit 2
-
-# Extract version from the Makefile
-MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \
-    | cut -d = -f 2)"
-PERCONA_SERVER_VERSION="$(grep ^PERCONA_SERVER_VERSION= \
-    "$SOURCEDIR/Makefile" | cut -d = -f 2)"
-PRODUCT="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
-
-# Build information
-REDHAT_RELEASE="$(grep -o 'release [0-9][0-9]*' /etc/redhat-release | \
-    cut -d ' ' -f 2)"
-REVISION="$(cd "$SOURCEDIR"; bzr log -r-1 | grep ^revno: | cut -d ' ' -f 2)"
-
-# Compilation flags
-export CC=gcc
-export CXX=gcc
-export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer $TARGET_CFLAGS"
-export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions $TARGET_CFLAGS"
-export MAKE_JFLAG=-j4
-
-# Create directories for rpmbuild if these don't exist
-(cd "$WORKDIR" && mkdir -p BUILD RPMS SOURCES SPECS SRPMS)
-
-# Prepare sources
-(
-    cd "$WORKDIR/SOURCES/"
- 
-    # Download the sources from the community site
-    if test "x$TARGET" = "xi686"
-    then
-        RPMVER=i386
-    elif test "x$(uname -m)" = "xx86_64"
-    then
-        RPMVER=x86_64
-    else
-        RPMVER=i386
-    fi
-
-    wget "http://www.percona.com/downloads/community/shared-compat/MySQL-shared-compat-$MYSQL_VERSION-1.linux2.6.$RPMVER.rpm"
-
-)
-
-# Issue rpmbuild command
-(
-    cd "$WORKDIR"
-
-    # Issue RPM command
-    rpmbuild -ba --clean --with yassl $SIGN \
-        "$SOURCEDIR/build/percona-shared-compat.spec" \
-        --define "_topdir $WORKDIR_ABS" \
-        --define "redhat_version $REDHAT_RELEASE" \
-        --define "gotrevision $REVISION" \
-        --define "release $PERCONA_SERVER_VERSION" \
-        $TARGET_ARG
-
-)
-