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

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

  1. 5.1-bug1133266
  2. Merge into 5.1
Proposed by Ignacio Nin
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 570
Proposed branch: lp:~ignacio-nin/percona-server/5.1-bug1133266
Merge into: lp:percona-server/5.1
Diff against target: 208 lines (+49/-16)
5 files modified
build/build-binary.sh (+11/-3)
build/build-dpkg.sh (+11/-2)
build/build-rpm.sh (+9/-1)
build/debian/rules (+10/-4)
build/percona-server.spec (+8/-6)
To merge this branch: bzr merge lp:~ignacio-nin/percona-server/5.1-bug1133266
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+167642@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-03-25 17:49:38 +0000
+++ build/build-binary.sh 2013-06-05 21:10:41 +0000
@@ -77,6 +77,14 @@
77SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"77SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
78test -e "$SOURCEDIR/Makefile" || exit 278test -e "$SOURCEDIR/Makefile" || exit 2
7979
80# The number of processors is a good default for -j
81if test -e "/proc/cpuinfo"
82then
83 PROCESSORS="$(grep -c ^processor /proc/cpuinfo)"
84else
85 PROCESSORS=4
86fi
87
80# Extract version from the Makefile88# Extract version from the Makefile
81MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \89MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \
82 | cut -d = -f 2)"90 | cut -d = -f 2)"
@@ -98,7 +106,7 @@
98export CXX=${CXX:-gcc}106export CXX=${CXX:-gcc}
99export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_INNODB_VERSION $TARGET_CFLAGS ${CFLAGS:-}"107export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_INNODB_VERSION $TARGET_CFLAGS ${CFLAGS:-}"
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:-}"108export 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:-}"
101export MAKE_JFLAG=-j4109export MAKE_JFLAG="${MAKE_JFLAG:--j$PROCESSORS}"
102110
103# Create a temporary working directory111# Create a temporary working directory
104INSTALLDIR="$(cd "$WORKDIR" && TMPDIR="$WORKDIR_ABS" mktemp -d percona-build.XXXXXX)"112INSTALLDIR="$(cd "$WORKDIR" && TMPDIR="$WORKDIR_ABS" mktemp -d percona-build.XXXXXX)"
@@ -142,7 +150,7 @@
142 --with-mysql-plugindir="/usr/local/$PRODUCT_FULL/lib/mysql/plugin" \150 --with-mysql-plugindir="/usr/local/$PRODUCT_FULL/lib/mysql/plugin" \
143 --libdir="/usr/local/$PRODUCT_FULL/lib/mysql/plugin" \151 --libdir="/usr/local/$PRODUCT_FULL/lib/mysql/plugin" \
144 --prefix="/usr/local/$PRODUCT_FULL"152 --prefix="/usr/local/$PRODUCT_FULL"
145 make153 make $MAKE_JFLAG
146 make DESTDIR="$INSTALLDIR" install154 make DESTDIR="$INSTALLDIR" install
147155
148 )156 )
@@ -152,7 +160,7 @@
152 cd "UDF"160 cd "UDF"
153 CXX=${UDF_CXX:-g++} ./configure --includedir="$SOURCEDIR/$PRODUCT/include" \161 CXX=${UDF_CXX:-g++} ./configure --includedir="$SOURCEDIR/$PRODUCT/include" \
154 --libdir="/usr/local/$PRODUCT_FULL/mysql/plugin"162 --libdir="/usr/local/$PRODUCT_FULL/mysql/plugin"
155 make163 make $MAKE_JFLAG
156 make DESTDIR="$INSTALLDIR" install164 make DESTDIR="$INSTALLDIR" install
157165
158 )166 )
159167
=== modified file 'build/build-dpkg.sh'
--- build/build-dpkg.sh 2013-05-23 09:10:47 +0000
+++ build/build-dpkg.sh 2013-06-05 21:10:41 +0000
@@ -67,6 +67,14 @@
67SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"67SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
68test -e "$SOURCEDIR/Makefile" || exit 268test -e "$SOURCEDIR/Makefile" || exit 2
6969
70# The number of processors is a good default for -j
71if test -e "/proc/cpuinfo"
72then
73 PROCESSORS="$(grep -c ^processor /proc/cpuinfo)"
74else
75 PROCESSORS=4
76fi
77
70# Extract version from the Makefile78# Extract version from the Makefile
71MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \79MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \
72 | cut -d = -f 2)"80 | cut -d = -f 2)"
@@ -79,12 +87,13 @@
79# Build information87# Build information
80export BB_PERCONA_REVISION="$(cd "$SOURCEDIR"; bzr revno)"88export BB_PERCONA_REVISION="$(cd "$SOURCEDIR"; bzr revno)"
81export DEB_BUILD_OPTIONS='debug'89export DEB_BUILD_OPTIONS='debug'
82export MYSQL_BUILD_CC='gcc'90export MYSQL_BUILD_CC="${CC:-gcc}"
83export MYSQL_BUILD_CXX='gcc'91export MYSQL_BUILD_CXX="${CXX:-gcc}"
84export HS_CXX=${HS_CXX:-g++}92export HS_CXX=${HS_CXX:-g++}
85export UDF_CXX=${UDF_CXX:-g++}93export UDF_CXX=${UDF_CXX:-g++}
86export MYSQL_BUILD_CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_INNODB_VERSION"94export MYSQL_BUILD_CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_INNODB_VERSION"
87export MYSQL_BUILD_CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DPERCONA_INNODB_VERSION=$PERCONA_INNODB_VERSION"95export MYSQL_BUILD_CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DPERCONA_INNODB_VERSION=$PERCONA_INNODB_VERSION"
96export MYSQL_BUILD_MAKE_JFLAG="${MAKE_JFLAG:--j$PROCESSORS}"
8897
89# Prepare sources98# Prepare sources
90(99(
91100
=== modified file 'build/build-rpm.sh'
--- build/build-rpm.sh 2013-03-06 10:46:45 +0000
+++ build/build-rpm.sh 2013-06-05 21:10:41 +0000
@@ -94,6 +94,14 @@
94SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"94SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
95test -e "$SOURCEDIR/Makefile" || exit 295test -e "$SOURCEDIR/Makefile" || exit 2
9696
97# The number of processors is a good default for -j
98if test -e "/proc/cpuinfo"
99then
100 PROCESSORS="$(grep -c ^processor /proc/cpuinfo)"
101else
102 PROCESSORS=4
103fi
104
97# Extract version from the Makefile105# Extract version from the Makefile
98MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \106MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \
99 | cut -d = -f 2)"107 | cut -d = -f 2)"
@@ -115,7 +123,7 @@
115export UDF_CXX=${UDF_CXX:-g++}123export UDF_CXX=${UDF_CXX:-g++}
116export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_INNODB_VERSION $TARGET_CFLAGS"124export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_INNODB_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"125export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DPERCONA_INNODB_VERSION=$PERCONA_INNODB_VERSION $TARGET_CFLAGS"
118export MAKE_JFLAG=-j4126export MAKE_JFLAG="${MAKE_JFLAG:--j$PROCESSORS}"
119127
120export MYSQL_RPMBUILD_TEST="$TEST"128export MYSQL_RPMBUILD_TEST="$TEST"
121129
122130
=== modified file 'build/debian/rules'
--- build/debian/rules 2013-05-30 05:37:36 +0000
+++ build/debian/rules 2013-06-05 21:10:41 +0000
@@ -28,8 +28,14 @@
2828
29MAKE_J = -j$(shell if [ -f /proc/cpuinfo ] ; then grep -c processor.* /proc/cpuinfo ; else echo 1 ; fi)29MAKE_J = -j$(shell if [ -f /proc/cpuinfo ] ; then grep -c processor.* /proc/cpuinfo ; else echo 1 ; fi)
30ifeq (${MAKE_J}, -j0)30ifeq (${MAKE_J}, -j0)
31 MAKE_J = -j131 MAKE_J = -j4
32endif32endif
33ifeq ($(MYSQL_BUILD_MAKE_JFLAG),)
34 MAKE_JFLAG = $(MAKE_J)
35else
36 MAKE_JFLAG = $(MYSQL_BUILD_MAKE_JFLAG)
37endif
38
33MYSQL_SRC = $(shell pwd)39MYSQL_SRC = $(shell pwd)
3440
35MAKE_TEST_TARGET=test-force41MAKE_TEST_TARGET=test-force
@@ -118,7 +124,7 @@
118build-stamp: configure124build-stamp: configure
119 dh_testdir125 dh_testdir
120126
121 $(MAKE) $(MAKE_J)127 $(MAKE) $(MAKE_JFLAG)
122ifneq ($(findstring check,$(DEB_BUILD_OPTIONS)),)128ifneq ($(findstring check,$(DEB_BUILD_OPTIONS)),)
123 if [ ! -f testsuite-stamp ] ; then \129 if [ ! -f testsuite-stamp ] ; then \
124 $(MAKE) $(MAKE_TEST_TARGET) || $(TESTSUITE_FAIL_CMD) ; \130 $(MAKE) $(MAKE_TEST_TARGET) || $(TESTSUITE_FAIL_CMD) ; \
@@ -196,7 +202,7 @@
196 --with-mysql-plugindir="/usr/lib/mysql/plugin" \202 --with-mysql-plugindir="/usr/lib/mysql/plugin" \
197 --libdir="/usr/lib" \203 --libdir="/usr/lib" \
198 --prefix="/usr" && \204 --prefix="/usr" && \
199 $(MAKE)205 $(MAKE) $(MAKE_JFLAG)
200 cd storage/HandlerSocket-Plugin-for-MySQL && $(MAKE) install DESTDIR=$(TMP)/206 cd storage/HandlerSocket-Plugin-for-MySQL && $(MAKE) install DESTDIR=$(TMP)/
201 # build Maatkit UDF207 # build Maatkit UDF
202 cd UDF/ && CXX="$${UDF_CXX:-g++}" ./configure --includedir=$(MYSQL_SRC)/include --libdir=/usr/lib/mysql/plugin && $(MAKE) all && $(MAKE) install DESTDIR=$(TMP)/208 cd UDF/ && CXX="$${UDF_CXX:-g++}" ./configure --includedir=$(MYSQL_SRC)/include --libdir=/usr/lib/mysql/plugin && $(MAKE) all && $(MAKE) install DESTDIR=$(TMP)/
203209
=== modified file 'build/percona-server.spec'
--- build/percona-server.spec 2013-05-23 09:09:56 +0000
+++ build/percona-server.spec 2013-06-05 21:10:41 +0000
@@ -273,9 +273,11 @@
273MAKE_J=-j`if [ -f /proc/cpuinfo ] ; then grep -c processor.* /proc/cpuinfo ; else echo 1 ; fi`273MAKE_J=-j`if [ -f /proc/cpuinfo ] ; then grep -c processor.* /proc/cpuinfo ; else echo 1 ; fi`
274if [ $MAKE_J = -j0 ]274if [ $MAKE_J = -j0 ]
275then275then
276 MAKE_J=-j1276 MAKE_J=-j4
277fi277fi
278278
279MAKE_JFLAG="${MAKE_JFLAG:-$MAKE_J}"
280
279# The --enable-assembler simply does nothing on systems that does not281# The --enable-assembler simply does nothing on systems that does not
280# support assembler speedups.282# support assembler speedups.
281sh -c "CFLAGS=\"$CFLAGS\" \283sh -c "CFLAGS=\"$CFLAGS\" \
@@ -309,7 +311,7 @@
309%endif311%endif
310 $OPT_DEBUG \312 $OPT_DEBUG \
311 --with-readline \313 --with-readline \
312 ; make $MAKE_J"314 ; make $MAKE_JFLAG"
313}315}
314# end of function definition "BuildMySQL"316# end of function definition "BuildMySQL"
315317
@@ -321,14 +323,14 @@
321 --with-mysql-plugindir=%{_libdir}/mysql/plugin \323 --with-mysql-plugindir=%{_libdir}/mysql/plugin \
322 --libdir=%{_libdir} \324 --libdir=%{_libdir} \
323 --prefix=%{_prefix}325 --prefix=%{_prefix}
324make326make $MAKE_JFLAG
325cd -327cd -
326}328}
327329
328BuildUDF() {330BuildUDF() {
329cd UDF331cd UDF
330CXX=${UDF_CXX:-g++} ./configure --includedir=$RPM_BUILD_DIR/%{src_dir}/include --libdir=%{_libdir}/mysql/plugin332CXX=${UDF_CXX:-g++} ./configure --includedir=$RPM_BUILD_DIR/%{src_dir}/include --libdir=%{_libdir}/mysql/plugin
331make all333make $MAKE_JFLAG all
332cd -334cd -
333}335}
334# end of function definition "BuildHandlerSocket"336# end of function definition "BuildHandlerSocket"
@@ -406,7 +408,7 @@
406( BuildServer ) # subshell, so that CFLAGS + CXXFLAGS are modified only locally408( BuildServer ) # subshell, so that CFLAGS + CXXFLAGS are modified only locally
407409
408if [ "$MYSQL_RPMBUILD_TEST" != "no" ] ; then410if [ "$MYSQL_RPMBUILD_TEST" != "no" ] ; then
409 MTR_BUILD_THREAD=auto make %{DEBUG_TEST_MODE}411 MTR_BUILD_THREAD=auto make $MAKE_JFLAG %{DEBUG_TEST_MODE}
410fi412fi
411413
412# Get the debug server and its .sym file from the build tree414# Get the debug server and its .sym file from the build tree
@@ -428,7 +430,7 @@
428BuildHandlerSocket430BuildHandlerSocket
429BuildUDF431BuildUDF
430if [ "$MYSQL_RPMBUILD_TEST" != "no" ] ; then432if [ "$MYSQL_RPMBUILD_TEST" != "no" ] ; then
431 MTR_BUILD_THREAD=auto make %{NORMAL_TEST_MODE}433 MTR_BUILD_THREAD=auto make $MAKE_JFLAG %{NORMAL_TEST_MODE}
432fi434fi
433435
434# Now, build plugin 436# Now, build plugin

Subscribers

People subscribed via source and target branches