Merge lp:~ignacio-nin/percona-server/5.1.60-bug917246 into lp:percona-server/5.1

[Ignacio Nin]

Revert innodb_version from relXX.Y to XX.Y

[Alexey Kopytov (akopytov)]

Approved. I have submitted a separate MP with a test case, will merge this one along with that branch.

review: Approve

[Alexey Kopytov (akopytov)]

Link to the test case MP: https://code.launchpad.net/~akopytov/percona-server/bug917246-5.1/+merge/89211

=== modified file 'build/build-binary.sh'
--- build/build-binary.sh	2011-12-15 05:10:45 +0000
+++ build/build-binary.sh	2012-01-16 21:49:25 +0000
@@ -82,6 +82,8 @@
     | cut -d = -f 2)"
 PERCONA_SERVER_VERSION="$(grep ^PERCONA_SERVER_VERSION= \
     "$SOURCEDIR/Makefile" | cut -d = -f 2)"
+PERCONA_INNODB_VERSION="$(echo "$PERCONA_SERVER_VERSION" |
+    sed s/rel//)"
 PRODUCT="Percona-Server-$MYSQL_VERSION"
 
 # Build information
@@ -94,8 +96,8 @@
 # Compilation flags
 export CC=${CC:-gcc}
 export CXX=${CXX:-gcc}
-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 CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_INNODB_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_INNODB_VERSION $TARGET_CFLAGS ${CXXFLAGS:-}"
 export MAKE_JFLAG=-j4
 
 # Create a temporary working directory

=== modified file 'build/build-dpkg.sh'
--- build/build-dpkg.sh	2011-12-15 05:10:45 +0000
+++ build/build-dpkg.sh	2012-01-16 21:49:25 +0000
@@ -65,6 +65,8 @@
 MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \
     | cut -d = -f 2)"
 PERCONA_SERVER_VERSION="$(grep ^PERCONA_SERVER_VERSION= "$SOURCEDIR/Makefile" | cut -d = -f 2)"
+PERCONA_INNODB_VERSION="$(echo "$PERCONA_SERVER_VERSION" |
+    sed s/rel//)"
 PRODUCT="Percona-Server-$MYSQL_VERSION"
 DEBIAN_VERSION="$(lsb_release -sc)"
 
@@ -75,8 +77,8 @@
 export MYSQL_BUILD_CXX='gcc'
 export HS_CXX=${HS_CXX:-g++}
 export UDF_CXX=${UDF_CXX:-g++}
-export MYSQL_BUILD_CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"
-export MYSQL_BUILD_CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"
+export MYSQL_BUILD_CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_INNODB_VERSION"
+export MYSQL_BUILD_CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DPERCONA_INNODB_VERSION=$PERCONA_INNODB_VERSION"
 
 # Prepare sources
 (

=== modified file 'build/build-rpm.sh'
--- build/build-rpm.sh	2011-12-15 05:10:45 +0000
+++ build/build-rpm.sh	2012-01-16 21:49:25 +0000
@@ -98,6 +98,8 @@
 MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \
     | cut -d = -f 2)"
 PERCONA_SERVER_VERSION="$(grep ^PERCONA_SERVER_VERSION= "$SOURCEDIR/Makefile" | cut -d = -f 2)"
+PERCONA_INNODB_VERSION="$(echo "$PERCONA_SERVER_VERSION" |
+    sed s/rel//)"
 PRODUCT="Percona-Server-$MYSQL_VERSION"
 
 # Build information
@@ -111,8 +113,8 @@
 export CXX=${CXX:-gcc}
 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"
-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"
+export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_INNODB_VERSION $TARGET_CFLAGS"
+export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DPERCONA_INNODB_VERSION=$PERCONA_INNODB_VERSION $TARGET_CFLAGS"
 export MAKE_JFLAG=-j4
 
 export MYSQL_RPMBUILD_TEST="$TEST"