Percona Server moved to https://jira.percona.com/projects/PS

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

  1. 5.1.60-bug917246
  2. Merge into 5.1
Proposed by Ignacio Nin
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 417
Proposed branch: lp:~ignacio-nin/percona-server/5.1.60-bug917246
Merge into: lp:percona-server/5.1
Diff against target: 71 lines (+12/-6)
3 files modified
build/build-binary.sh (+4/-2)
build/build-dpkg.sh (+4/-2)
build/build-rpm.sh (+4/-2)
To merge this branch: bzr merge lp:~ignacio-nin/percona-server/5.1.60-bug917246
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+88780@code.launchpad.net

Description of the change

Revert innodb_version from relXX.Y to XX.Y

To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) wrote :

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

review: Approve
Revision history for this message
Alexey Kopytov (akopytov) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
82 | cut -d = -f 2)"82 | cut -d = -f 2)"
83PERCONA_SERVER_VERSION="$(grep ^PERCONA_SERVER_VERSION= \83PERCONA_SERVER_VERSION="$(grep ^PERCONA_SERVER_VERSION= \
84 "$SOURCEDIR/Makefile" | cut -d = -f 2)"84 "$SOURCEDIR/Makefile" | cut -d = -f 2)"
85PERCONA_INNODB_VERSION="$(echo "$PERCONA_SERVER_VERSION" |
86 sed s/rel//)"
85PRODUCT="Percona-Server-$MYSQL_VERSION"87PRODUCT="Percona-Server-$MYSQL_VERSION"
8688
87# Build information89# Build information
@@ -94,8 +96,8 @@
94# Compilation flags96# Compilation flags
95export CC=${CC:-gcc}97export CC=${CC:-gcc}
96export CXX=${CXX:-gcc}98export CXX=${CXX:-gcc}
97export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CFLAGS:-}"99export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_INNODB_VERSION $TARGET_CFLAGS ${CFLAGS:-}"
98export 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:-}"100export 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:-}"
99export MAKE_JFLAG=-j4101export MAKE_JFLAG=-j4
100102
101# Create a temporary working directory103# Create a temporary working directory
102104
=== 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 @@
65MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \65MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \
66 | cut -d = -f 2)"66 | cut -d = -f 2)"
67PERCONA_SERVER_VERSION="$(grep ^PERCONA_SERVER_VERSION= "$SOURCEDIR/Makefile" | cut -d = -f 2)"67PERCONA_SERVER_VERSION="$(grep ^PERCONA_SERVER_VERSION= "$SOURCEDIR/Makefile" | cut -d = -f 2)"
68PERCONA_INNODB_VERSION="$(echo "$PERCONA_SERVER_VERSION" |
69 sed s/rel//)"
68PRODUCT="Percona-Server-$MYSQL_VERSION"70PRODUCT="Percona-Server-$MYSQL_VERSION"
69DEBIAN_VERSION="$(lsb_release -sc)"71DEBIAN_VERSION="$(lsb_release -sc)"
7072
@@ -75,8 +77,8 @@
75export MYSQL_BUILD_CXX='gcc'77export MYSQL_BUILD_CXX='gcc'
76export HS_CXX=${HS_CXX:-g++}78export HS_CXX=${HS_CXX:-g++}
77export UDF_CXX=${UDF_CXX:-g++}79export UDF_CXX=${UDF_CXX:-g++}
78export MYSQL_BUILD_CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"80export MYSQL_BUILD_CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_INNODB_VERSION"
79export MYSQL_BUILD_CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"81export MYSQL_BUILD_CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DPERCONA_INNODB_VERSION=$PERCONA_INNODB_VERSION"
8082
81# Prepare sources83# Prepare sources
82(84(
8385
=== 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 @@
98MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \98MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \
99 | cut -d = -f 2)"99 | cut -d = -f 2)"
100PERCONA_SERVER_VERSION="$(grep ^PERCONA_SERVER_VERSION= "$SOURCEDIR/Makefile" | cut -d = -f 2)"100PERCONA_SERVER_VERSION="$(grep ^PERCONA_SERVER_VERSION= "$SOURCEDIR/Makefile" | cut -d = -f 2)"
101PERCONA_INNODB_VERSION="$(echo "$PERCONA_SERVER_VERSION" |
102 sed s/rel//)"
101PRODUCT="Percona-Server-$MYSQL_VERSION"103PRODUCT="Percona-Server-$MYSQL_VERSION"
102104
103# Build information105# Build information
@@ -111,8 +113,8 @@
111export CXX=${CXX:-gcc}113export CXX=${CXX:-gcc}
112export HS_CXX=${HS_CXX:-g++}114export HS_CXX=${HS_CXX:-g++}
113export UDF_CXX=${UDF_CXX:-g++}115export UDF_CXX=${UDF_CXX:-g++}
114export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS"116export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_INNODB_VERSION $TARGET_CFLAGS"
115export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS"117export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DPERCONA_INNODB_VERSION=$PERCONA_INNODB_VERSION $TARGET_CFLAGS"
116export MAKE_JFLAG=-j4118export MAKE_JFLAG=-j4
117119
118export MYSQL_RPMBUILD_TEST="$TEST"120export MYSQL_RPMBUILD_TEST="$TEST"

Subscribers

People subscribed via source and target branches