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

Merge lp:~ignacio-nin/percona-server/5.6-bug1133266 into lp:percona-server/5.6

  1. 5.6-bug1133266
  2. Merge into 5.6
Proposed by Ignacio Nin
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 380
Proposed branch: lp:~ignacio-nin/percona-server/5.6-bug1133266
Merge into: lp:percona-server/5.6
Diff against target: 117 lines (+32/-6)
4 files modified
build/build-binary.sh (+11/-3)
build/build-dpkg.sh (+11/-1)
build/build-rpm.sh (+9/-1)
build/percona-server.spec (+1/-1)
To merge this branch: bzr merge lp:~ignacio-nin/percona-server/5.6-bug1133266
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+167637@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

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 2013-05-31 08:06:00 +0000
+++ build/build-binary.sh 2013-06-05 20:52:38 +0000
@@ -97,6 +97,14 @@
97SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"97SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
98test -e "$SOURCEDIR/Makefile" || exit 298test -e "$SOURCEDIR/Makefile" || exit 2
9999
100# The number of processors is a good default for -j
101if test -e "/proc/cpuinfo"
102then
103 PROCESSORS="$(grep -c ^processor /proc/cpuinfo)"
104else
105 PROCESSORS=4
106fi
107
100# Extract version from the Makefile108# Extract version from the Makefile
101MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \109MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \
102 | cut -d = -f 2)"110 | cut -d = -f 2)"
@@ -116,7 +124,7 @@
116export CXX=${CXX:-g++}124export CXX=${CXX:-g++}
117export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CFLAGS:-}"125export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CFLAGS:-}"
118export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CXXFLAGS:-}"126export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CXXFLAGS:-}"
119export MAKE_JFLAG=-j4127export MAKE_JFLAG="${MAKE_JFLAG:--j$PROCESSORS}"
120128
121# Create a temporary working directory129# Create a temporary working directory
122INSTALLDIR="$(cd "$WORKDIR" && TMPDIR="$WORKDIR_ABS" mktemp -d percona-build.XXXXXX)"130INSTALLDIR="$(cd "$WORKDIR" && TMPDIR="$WORKDIR_ABS" mktemp -d percona-build.XXXXXX)"
@@ -163,7 +171,7 @@
163 cd "UDF"171 cd "UDF"
164 CXX=${UDF_CXX:-g++} ./configure --includedir="$SOURCEDIR/$PRODUCT/include" \172 CXX=${UDF_CXX:-g++} ./configure --includedir="$SOURCEDIR/$PRODUCT/include" \
165 --libdir="/usr/local/$PRODUCT_FULL/mysql/plugin"173 --libdir="/usr/local/$PRODUCT_FULL/mysql/plugin"
166 make174 make $MAKE_JFLAG
167 make DESTDIR="$INSTALLDIR" install175 make DESTDIR="$INSTALLDIR" install
168176
169 )177 )
@@ -176,7 +184,7 @@
176184
177 ./configure --prefix="/usr/local/$PRODUCT_FULL/" \185 ./configure --prefix="/usr/local/$PRODUCT_FULL/" \
178 --libdir="/usr/local/$PRODUCT_FULL/lib/mysql/"186 --libdir="/usr/local/$PRODUCT_FULL/lib/mysql/"
179 make187 make $MAKE_JFLAG
180 make DESTDIR="$INSTALLDIR" install_lib_shared188 make DESTDIR="$INSTALLDIR" install_lib_shared
181189
182 # Copy COPYING file190 # Copy COPYING file
183191
=== modified file 'build/build-dpkg.sh'
--- build/build-dpkg.sh 2013-05-27 03:01:29 +0000
+++ build/build-dpkg.sh 2013-06-05 20:52:38 +0000
@@ -69,6 +69,14 @@
69SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"69SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
70test -e "$SOURCEDIR/Makefile" || exit 270test -e "$SOURCEDIR/Makefile" || exit 2
7171
72# The number of processors is a good default for -j
73if test -e "/proc/cpuinfo"
74then
75 PROCESSORS="$(grep -c ^processor /proc/cpuinfo)"
76else
77 PROCESSORS=4
78fi
79
72# Extract version from the Makefile80# Extract version from the Makefile
73MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \81MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \
74 | cut -d = -f 2)"82 | cut -d = -f 2)"
@@ -84,9 +92,11 @@
84# Compilation flags92# Compilation flags
85export CC=${CC:-gcc}93export CC=${CC:-gcc}
86export CXX=${CXX:-g++}94export CXX=${CXX:-g++}
95export HS_CXX=${HS_CXX:-g++}
96export UDF_CXX=${UDF_CXX:-g++}
87export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION ${CFLAGS:-}"97export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION ${CFLAGS:-}"
88export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION ${CXXFLAGS:-}"98export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION ${CXXFLAGS:-}"
89export MAKE_JFLAG=-j499export MAKE_JFLAG="${MAKE_JFLAG:--j$PROCESSORS}"
90100
91# Prepare sources101# Prepare sources
92(102(
93103
=== modified file 'build/build-rpm.sh'
--- build/build-rpm.sh 2013-05-31 08:06:00 +0000
+++ build/build-rpm.sh 2013-06-05 20:52:38 +0000
@@ -98,6 +98,14 @@
98SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"98SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
99test -e "$SOURCEDIR/Makefile" || exit 299test -e "$SOURCEDIR/Makefile" || exit 2
100100
101# The number of processors is a good default for -j
102if test -e "/proc/cpuinfo"
103then
104 PROCESSORS="$(grep -c ^processor /proc/cpuinfo)"
105else
106 PROCESSORS=4
107fi
108
101# Extract version from the Makefile109# Extract version from the Makefile
102MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \110MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \
103 | cut -d = -f 2)"111 | cut -d = -f 2)"
@@ -117,7 +125,7 @@
117export UDF_CXX="${UDF_CXX:-g++}"125export UDF_CXX="${UDF_CXX:-g++}"
118export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CFLAGS:-}"126export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CFLAGS:-}"
119export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CXXFLAGS:-}"127export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CXXFLAGS:-}"
120export MAKE_JFLAG=-j4128export MAKE_JFLAG="${MAKE_JFLAG:--j$PROCESSORS}"
121129
122# Create directories for rpmbuild if these don't exist130# Create directories for rpmbuild if these don't exist
123(cd "$WORKDIR" && mkdir -p BUILD RPMS SOURCES SPECS SRPMS)131(cd "$WORKDIR" && mkdir -p BUILD RPMS SOURCES SPECS SRPMS)
124132
=== modified file 'build/percona-server.spec'
--- build/percona-server.spec 2013-06-03 01:41:20 +0000
+++ build/percona-server.spec 2013-06-05 20:52:38 +0000
@@ -348,7 +348,7 @@
348 CXXFLAGS="$CXXFLAGS -I$RPM_BUILD_DIR/%{src_dir}/release/include" \348 CXXFLAGS="$CXXFLAGS -I$RPM_BUILD_DIR/%{src_dir}/release/include" \
349 ./configure --includedir=$RPM_BUILD_DIR/%{src_dir}/include \349 ./configure --includedir=$RPM_BUILD_DIR/%{src_dir}/include \
350 --libdir=%{_libdir}/mysql/plugin350 --libdir=%{_libdir}/mysql/plugin
351 make all351 make ${MAKE_JFLAG} all
352 cd -352 cd -
353}353}
354354

Subscribers

People subscribed via source and target branches