Percona XtraDB Cluster moved to https://jira.percona.com/projects/PXC

Merge lp:~ignacio-nin/percona-xtradb-cluster/pxc-bug1133266 into lp:percona-xtradb-cluster/percona-xtradb-cluster-5.5

  1. pxc-bug1133266
  2. Merge into 5.5
Proposed by Ignacio Nin
Status: Merged
Approved by: Raghavendra D Prabhu
Approved revision: no longer in the source branch.
Merged at revision: 388
Proposed branch: lp:~ignacio-nin/percona-xtradb-cluster/pxc-bug1133266
Merge into: lp:percona-xtradb-cluster/percona-xtradb-cluster-5.5
Diff against target: 149 lines (+38/-11)
4 files modified
build/build-binary.sh (+14/-5)
build/build-dpkg.sh (+13/-3)
build/build-rpm.sh (+9/-1)
build/percona-xtradb-cluster.spec (+2/-2)
To merge this branch: bzr merge lp:~ignacio-nin/percona-xtradb-cluster/pxc-bug1133266
Reviewer Review Type Date Requested Status
Raghavendra D Prabhu (community) Approve
Review via email: mp+167638@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Raghavendra D Prabhu (raghavendra-prabhu) wrote :

Looks good.

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-04-06 09:45:47 +0000
+++ build/build-binary.sh 2013-06-05 20:52:42 +0000
@@ -106,6 +106,14 @@
106 exit 1106 exit 1
107fi107fi
108108
109# The number of processors is a good default for -j
110if test -e "/proc/cpuinfo"
111then
112 PROCESSORS="$(grep -c ^processor /proc/cpuinfo)"
113else
114 PROCESSORS=4
115fi
116
109# Extract version from the Makefile117# Extract version from the Makefile
110MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \118MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \
111 | cut -d = -f 2)"119 | cut -d = -f 2)"
@@ -131,7 +139,7 @@
131export CXX=${CXX:-gcc}139export CXX=${CXX:-gcc}
132export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CFLAGS:-}"140export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CFLAGS:-}"
133export 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:-}"141export 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:-}"
134export MAKE_JFLAG=-j4142export MAKE_JFLAG="${MAKE_JFLAG:--j$PROCESSORS}"
135143
136export WSREP_REV="$WSREP_REV"144export WSREP_REV="$WSREP_REV"
137145
@@ -162,7 +170,8 @@
162 export CXX=${GALERA_CXX:-g++}170 export CXX=${GALERA_CXX:-g++}
163171
164 cd "percona-xtradb-cluster-galera"172 cd "percona-xtradb-cluster-galera"
165 scons --config=force revno="$GALERA_REVISION" garb/garbd libgalera_smm.so173 scons --config=force revno="$GALERA_REVISION" $MAKE_JFLAG \
174 garb/garbd libgalera_smm.so
166 mkdir -p "$INSTALLDIR/usr/local/$PRODUCT_FULL/bin" \175 mkdir -p "$INSTALLDIR/usr/local/$PRODUCT_FULL/bin" \
167 "$INSTALLDIR/usr/local/$PRODUCT_FULL/lib"176 "$INSTALLDIR/usr/local/$PRODUCT_FULL/lib"
168 cp garb/garbd "$INSTALLDIR/usr/local/$PRODUCT_FULL/bin"177 cp garb/garbd "$INSTALLDIR/usr/local/$PRODUCT_FULL/bin"
@@ -203,7 +212,7 @@
203 --with-mysql-plugindir="/usr/local/$PRODUCT_FULL/lib/mysql/plugin" \212 --with-mysql-plugindir="/usr/local/$PRODUCT_FULL/lib/mysql/plugin" \
204 --libdir="/usr/local/$PRODUCT_FULL/lib/mysql/plugin" \213 --libdir="/usr/local/$PRODUCT_FULL/lib/mysql/plugin" \
205 --prefix="/usr/local/$PRODUCT_FULL"214 --prefix="/usr/local/$PRODUCT_FULL"
206 make215 make $MAKE_JFLAG
207 make DESTDIR="$INSTALLDIR" install216 make DESTDIR="$INSTALLDIR" install
208217
209 )218 )
@@ -213,7 +222,7 @@
213 cd "UDF"222 cd "UDF"
214 CXX=${UDF_CXX:-g++} ./configure --includedir="$INSTALLDIR/src/Percona-Server/include" \223 CXX=${UDF_CXX:-g++} ./configure --includedir="$INSTALLDIR/src/Percona-Server/include" \
215 --libdir="/usr/local/$PRODUCT_FULL/mysql/plugin"224 --libdir="/usr/local/$PRODUCT_FULL/mysql/plugin"
216 make225 make $MAKE_JFLAG
217 make DESTDIR="$INSTALLDIR" install226 make DESTDIR="$INSTALLDIR" install
218227
219 )228 )
@@ -226,7 +235,7 @@
226235
227 ./configure --prefix="/usr/local/$PRODUCT_FULL/" \236 ./configure --prefix="/usr/local/$PRODUCT_FULL/" \
228 --libdir="/usr/local/$PRODUCT_FULL/lib/mysql/"237 --libdir="/usr/local/$PRODUCT_FULL/lib/mysql/"
229 make238 make $MAKE_JFLAG
230 make DESTDIR="$INSTALLDIR" install_lib_shared239 make DESTDIR="$INSTALLDIR" install_lib_shared
231240
232 # Copy COPYING file241 # Copy COPYING file
233242
=== modified file 'build/build-dpkg.sh'
--- build/build-dpkg.sh 2013-04-11 20:42:44 +0000
+++ build/build-dpkg.sh 2013-06-05 20:52:42 +0000
@@ -64,6 +64,14 @@
64SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"64SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
65test -e "$SOURCEDIR/Makefile" || exit 265test -e "$SOURCEDIR/Makefile" || exit 2
6666
67# The number of processors is a good default for -j
68if test -e "/proc/cpuinfo"
69then
70 PROCESSORS="$(grep -c ^processor /proc/cpuinfo)"
71else
72 PROCESSORS=4
73fi
74
67# Extract version from the Makefile75# Extract version from the Makefile
68MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \76MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \
69 | cut -d = -f 2)"77 | cut -d = -f 2)"
@@ -80,11 +88,13 @@
80export DEB_BUILD_OPTIONS='debug nocheck'88export DEB_BUILD_OPTIONS='debug nocheck'
8189
82# Compilation flags90# Compilation flags
83export CC=${CC:-gcc}91export CC="${CC:-gcc}"
84export CXX=${CXX:-gcc}92export CXX="${CXX:-gcc}"
93export HS_CXX=${HS_CXX:-g++}
94export UDF_CXX=${UDF_CXX:-g++}
85export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION ${CFLAGS:-}"95export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION ${CFLAGS:-}"
86export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION ${CXXFLAGS:-}"96export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION ${CXXFLAGS:-}"
87export MAKE_JFLAG=-j497export MAKE_JFLAG="${MAKE_JFLAG:--j$PROCESSORS}"
8898
89# Prepare sources99# Prepare sources
90(100(
91101
=== modified file 'build/build-rpm.sh'
--- build/build-rpm.sh 2013-04-05 17:15:41 +0000
+++ build/build-rpm.sh 2013-06-05 20:52:42 +0000
@@ -96,6 +96,14 @@
96SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"96SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
97test -e "$SOURCEDIR/Makefile" || exit 297test -e "$SOURCEDIR/Makefile" || exit 2
9898
99# The number of processors is a good default for -j
100if test -e "/proc/cpuinfo"
101then
102 PROCESSORS="$(grep -c ^processor /proc/cpuinfo)"
103else
104 PROCESSORS=4
105fi
106
99# Extract version from the Makefile107# Extract version from the Makefile
100MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \108MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \
101 | cut -d = -f 2)"109 | cut -d = -f 2)"
@@ -119,7 +127,7 @@
119export UDF_CXX=${UDF_CXX:-g++}127export UDF_CXX=${UDF_CXX:-g++}
120export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CFLAGS:-}"128export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION $TARGET_CFLAGS ${CFLAGS:-}"
121export 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:-}"129export 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:-}"
122export MAKE_JFLAG=-j4130export MAKE_JFLAG="${MAKE_JFLAG:--j$PROCESSORS}"
123131
124# For the wsrep version132# For the wsrep version
125export WSREP_REV="$(cd "$SOURCEDIR";test -r WSREP-REVISION && cat WSREP-REVISION || echo "$REVISION")"133export WSREP_REV="$(cd "$SOURCEDIR";test -r WSREP-REVISION && cat WSREP-REVISION || echo "$REVISION")"
126134
=== modified file 'build/percona-xtradb-cluster.spec'
--- build/percona-xtradb-cluster.spec 2013-04-23 05:19:16 +0000
+++ build/percona-xtradb-cluster.spec 2013-06-05 20:52:42 +0000
@@ -401,7 +401,7 @@
401 --with-mysql-plugindir=%{_libdir}/mysql/plugin \401 --with-mysql-plugindir=%{_libdir}/mysql/plugin \
402 --libdir=%{_libdir} \402 --libdir=%{_libdir} \
403 --prefix=%{_prefix}403 --prefix=%{_prefix}
404 make404 make ${MAKE_JFLAG}
405 cd -405 cd -
406}406}
407407
@@ -411,7 +411,7 @@
411 CXXFLAGS="$CXXFLAGS -I$RPM_BUILD_DIR/%{src_dir}/release/include" \411 CXXFLAGS="$CXXFLAGS -I$RPM_BUILD_DIR/%{src_dir}/release/include" \
412 ./configure --includedir=$RPM_BUILD_DIR/%{src_dir}/%{src_dir}/include \412 ./configure --includedir=$RPM_BUILD_DIR/%{src_dir}/%{src_dir}/include \
413 --libdir=%{_libdir}/mysql/plugin413 --libdir=%{_libdir}/mysql/plugin
414 make all414 make ${MAKE_JFLAG} all
415 cd -415 cd -
416}416}
417417

Subscribers

People subscribed via source and target branches

to all changes: