Merge lp:~ignacio-nin/percona-xtradb-cluster/fix-revno375 into lp:~percona-dev/percona-xtradb-cluster/5.5.28

Proposed by Ignacio Nin
Status: Work in progress
Proposed branch: lp:~ignacio-nin/percona-xtradb-cluster/fix-revno375
Merge into: lp:~percona-dev/percona-xtradb-cluster/5.5.28
Diff against target: 983 lines (+166/-430)
10 files modified
Makefile (+0/-80)
build/build-binary.sh (+50/-22)
build/build-dpkg.sh (+10/-15)
build/build-shared-compat-rpm.sh (+1/-6)
build/debian/control (+60/-103)
build/debian/percona-server-server-5.5.docs (+0/-8)
build/debian/percona-server-server-5.5.install (+0/-56)
build/debian/rules (+42/-44)
build/percona-shared-compat.spec (+0/-93)
build/percona-xtradb-cluster.spec (+3/-3)
To merge this branch: bzr merge lp:~ignacio-nin/percona-xtradb-cluster/fix-revno375
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Needs Fixing
Vadim Tkachenko Pending
Review via email: mp+143929@code.launchpad.net

Description of the change

Remerge of revision 375, preserving the original build/ and Makefile files (from revision 374)

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

Ignacio,

please, don't use "bzr rm". As I understand, the intention here is to get rid of conflicts in Makefile. But this patch does the reverse: whenever there's a change in PS Makefile (even the one that does not conflict with PXC changes), you'll get a contents conflict due to file-ids mismatch.

If you want to merge changes from Makefile in PS to Makefile in PXC, you need to keep the current Makefile with the same file-id as in the PS branch. Whenever you get _text_ conflicts, you have to fix them. If you get them frequently, think how Makefile can be changed to reduce those conflicts. Perhaps there must be a make variable controlling Makefile's behavior. Or maybe just moving frequently changing part in PS Makefile would be sufficient to avoid most conflicts?

If you never want to merge PS Makefile into PXC Makefile (which I doubt), you can rename Makefile into something else in the PXC branch and add a new file with the same name. But I don't think that's what we really need. PXC is still a "branch" of PS, so we make some build-related changes in PS we want to replicate them in PXC in most cases, right? So merging is a natural way to do that.

review: Needs Fixing

Unmerged revisions

375. By Ignacio Nin

Merge of trunk at rev 375, preserving the build files

At revno 375 in trunk, the build scripts in build/ and Makefile were
overridden with the ones from Percona Server, losing their original
contents.

This commit is a merge from revno 375, but preserving this files, with
the intention of then remerging into trunk in order to recover these.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'Makefile'
2--- Makefile 1970-01-01 00:00:00 +0000
3+++ Makefile 2013-01-18 18:35:38 +0000
4@@ -0,0 +1,82 @@
5+FETCH_CMD=wget
6+MASTER_SITE=http://s3.amazonaws.com/percona.com/downloads/community
7+MYSQL_VERSION=5.5.28
8+PERCONA_SERVER_VERSION=rel29.1
9+PERCONA_XTRADB_CLUSTER ?=Percona-XtraDB-Cluster-$(MYSQL_VERSION)
10+PERCONA_SERVER ?=Percona-Server
11+DEBUG_DIR ?= $(PERCONA_XTRADB_CLUSTER)-debug
12+RELEASE_DIR ?= $(PERCONA_XTRADB_CLUSTER)-release
13+SERIES ?=series
14+
15+CFLAGS=-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing
16+CXXFLAGS=-fno-exceptions -fPIC -Wall -Wno-unused-parameter -fno-implicit-templates -fno-exceptions -fno-rtti -O3 -g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing
17+
18+CFLAGS_RELEASE=$(CFLAGS) -DDBUG_OFF -DMY_PTHREAD_FASTMUTEX=1
19+CXXFLAGS_RELEASE=$(CXXFLAGS) -DDBUG_OFF -DMY_PTHREAD_FASTMUTEX=1
20+
21+CMAKE=CC=gcc CXX=gcc cmake $(ADDITIONAL)
22+ADDITIONAL ?=
23+CONFIGURE=CFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2" CXXFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2" LIBS=-lrt ./configure --prefix=/usr/local/$(PERCONA_XTRADB_CLUSTER) --with-plugin-innobase --with-plugin-partition
24+
25+REVS = $(shell bzr log | grep rev | head -1 )
26+REV = $(word 2, $(REVS) )
27+
28+all: main handlersocket maatkit-udf install-lic
29+ @echo ""
30+ @echo "Percona Server source code is ready"
31+ @echo "Now change directory to $(PERCONA_XTRADB_CLUSTER) define variables as show below"
32+ @echo ""
33+ export CFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2"
34+ export CXXFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2"
35+ export LIBS=-lrt
36+ @echo ""
37+ @echo "and run cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_CONFIG=mysql_release -DFEATURE_SET=community -DWITH_EMBEDDED_SERVER=OFF && make all install"
38+ @echo ""
39+
40+handlersocket:
41+ cp -R HandlerSocket-Plugin-for-MySQL $(PERCONA_XTRADB_CLUSTER)/storage
42+ patch -p1 -d $(PERCONA_XTRADB_CLUSTER)/storage < handlersocket.patch
43+
44+maatkit-udf:
45+ cp -R UDF "$(PERCONA_XTRADB_CLUSTER)"
46+ cd "$(PERCONA_XTRADB_CLUSTER)"/UDF && autoreconf --install
47+
48+configure: all
49+ (cd $(PERCONA_XTRADB_CLUSTER); bash BUILD/autorun.sh; $(CONFIGURE))
50+
51+cmake: cmake_release cmake_debug
52+
53+cmake_release:
54+ rm -rf $(RELEASE_DIR)
55+ (mkdir -p $(RELEASE_DIR); cd $(RELEASE_DIR); CFLAGS="$(CFLAGS_RELEASE)" CXXFLAGS="$(CXXFLAGS_RELEASE)" $(CMAKE) -G "Unix Makefiles" ../$(PERCONA_XTRADB_CLUSTER))
56+
57+cmake_debug:
58+ rm -rf $(DEBUG_DIR)
59+ (mkdir -p $(DEBUG_DIR); cd $(DEBUG_DIR); CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(CMAKE) -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DWITH_DEBUG=ON -DMYSQL_MAINTAINER_MODE=OFF ../$(PERCONA_XTRADB_CLUSTER))
60+
61+binary:
62+ (cd $(PERCONA_XTRADB_CLUSTER); CFLAGS="$(CFLAGS_RELEASE)" CXXFLAGS="$(CXXFLAGS_RELEASE)" ${CMAKE} . -DBUILD_CONFIG=mysql_release \
63+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
64+ -DCMAKE_INSTALL_PREFIX="/usr/local/$(PERCONA_XTRADB_CLUSTER)-$(REV)" \
65+ -DFEATURE_SET="community" \
66+ -DWITH_EMBEDDED_SERVER=OFF \
67+ -DCOMPILATION_COMMENT="Percona-Server" \
68+ -DMYSQL_SERVER_SUFFIX="-$(REV)" )
69+
70+install-lic:
71+ @echo "Installing license files"
72+ install -m 644 COPYING.* $(PERCONA_XTRADB_CLUSTER)
73+
74+prepare:
75+ @echo "Prepare Percona Server sources"
76+ rm -f $(PERCONA_XTRADB_CLUSTER)
77+ ln -s $(PERCONA_SERVER) $(PERCONA_XTRADB_CLUSTER)
78+
79+main: prepare
80+
81+misc:
82+ @echo "Installing other files"
83+ install -m 644 lrusort.py $(PERCONA_XTRADB_CLUSTER)/scripts
84+
85+clean:
86+ rm -rf mysql-$(MYSQL_VERSION) $(PERCONA_XTRADB_CLUSTER) $(RELEASE_DIR) $(DEBUG_DIR)
87
88=== removed file 'Makefile'
89--- Makefile 2012-12-06 19:08:25 +0000
90+++ Makefile 1970-01-01 00:00:00 +0000
91@@ -1,80 +0,0 @@
92-FETCH_CMD=wget
93-MASTER_SITE=http://s3.amazonaws.com/percona.com/downloads/community
94-MYSQL_VERSION=5.5.28
95-PERCONA_SERVER_VERSION=rel29.2
96-PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
97-PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
98-PERCONA_SERVER_SHORT_2 ?=Percona-Server
99-DEBUG_DIR ?= $(PERCONA_SERVER)-debug
100-RELEASE_DIR ?= $(PERCONA_SERVER)-release
101-SERIES ?=series
102-
103-CFLAGS=-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing
104-CXXFLAGS=-fno-exceptions -fPIC -Wall -Wno-unused-parameter -fno-implicit-templates -fno-exceptions -fno-rtti -O3 -g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing
105-
106-CFLAGS_RELEASE=$(CFLAGS) -DDBUG_OFF -DMY_PTHREAD_FASTMUTEX=1
107-CXXFLAGS_RELEASE=$(CXXFLAGS) -DDBUG_OFF -DMY_PTHREAD_FASTMUTEX=1
108-
109-CMAKE=CC=gcc CXX=gcc cmake $(ADDITIONAL)
110-ADDITIONAL ?=
111-CONFIGURE=CFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2" CXXFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2" LIBS=-lrt ./configure --prefix=/usr/local/$(PERCONA_SERVER)-$(MYSQL_VERSION) --with-plugin-innobase --with-plugin-partition
112-
113-REVS = $(shell bzr log | grep rev | head -1 )
114-REV = $(word 2, $(REVS) )
115-
116-all: main handlersocket maatkit-udf install-lic
117- @echo ""
118- @echo "Percona Server source code is ready"
119- @echo "Now change directory to $(PERCONA_SERVER) define variables as show below"
120- @echo ""
121- export CFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2"
122- export CXXFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2"
123- export LIBS=-lrt
124- @echo ""
125- @echo "and run cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_CONFIG=mysql_release -DFEATURE_SET=community -DWITH_EMBEDDED_SERVER=OFF && make all install"
126- @echo ""
127-
128-handlersocket:
129- cp -R HandlerSocket-Plugin-for-MySQL $(PERCONA_SERVER)/storage
130- patch -p1 -d $(PERCONA_SERVER)/storage < handlersocket.patch
131-
132-maatkit-udf:
133- cp -R UDF "$(PERCONA_SERVER)"
134- cd "$(PERCONA_SERVER)"/UDF && autoreconf --install
135-
136-configure: all
137- (cd $(PERCONA_SERVER); bash BUILD/autorun.sh; $(CONFIGURE))
138-
139-cmake: cmake_release cmake_debug
140-
141-cmake_release:
142- rm -rf $(RELEASE_DIR)
143- (mkdir -p $(RELEASE_DIR); cd $(RELEASE_DIR); CFLAGS="$(CFLAGS_RELEASE)" CXXFLAGS="$(CXXFLAGS_RELEASE)" $(CMAKE) -G "Unix Makefiles" ../$(PERCONA_SERVER))
144-
145-cmake_debug:
146- rm -rf $(DEBUG_DIR)
147- (mkdir -p $(DEBUG_DIR); cd $(DEBUG_DIR); CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(CMAKE) -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DWITH_DEBUG=ON -DMYSQL_MAINTAINER_MODE=OFF ../$(PERCONA_SERVER))
148-
149-binary:
150- (cd $(PERCONA_SERVER); CFLAGS="$(CFLAGS_RELEASE)" CXXFLAGS="$(CXXFLAGS_RELEASE)" ${CMAKE} . -DBUILD_CONFIG=mysql_release \
151- -DCMAKE_BUILD_TYPE=RelWithDebInfo \
152- -DCMAKE_INSTALL_PREFIX="/usr/local/$(PERCONA_SERVER)-$(MYSQL_VERSION)-$(REV)" \
153- -DFEATURE_SET="community" \
154- -DWITH_EMBEDDED_SERVER=OFF \
155- -DCOMPILATION_COMMENT="Percona-Server" \
156- -DMYSQL_SERVER_SUFFIX="-$(REV)" )
157-
158-install-lic:
159- @echo "Installing license files"
160- install -m 644 COPYING.* $(PERCONA_SERVER)
161-
162-prepare:
163- @echo "Prepare Percona Server sources"
164- rm -rf $(PERCONA_SERVER) $(PERCONA_SERVER_SHORT_1)
165- ln -s $(PERCONA_SERVER_SHORT_2) $(PERCONA_SERVER)
166- ln -s $(PERCONA_SERVER_SHORT_2) $(PERCONA_SERVER_SHORT_1)
167-
168-main: prepare
169-
170-clean:
171- rm -rf $(RELEASE_DIR) $(DEBUG_DIR)
172
173=== modified file 'build/build-binary.sh'
174--- build/build-binary.sh 2012-12-22 02:14:09 +0000
175+++ build/build-binary.sh 2013-01-18 18:35:38 +0000
176@@ -1,7 +1,7 @@
177 #!/bin/sh
178 #
179 # Execute this tool to setup the environment and build binary releases
180-# for Percona-Server starting from a fresh tree.
181+# for Percona XtraDB Cluster starting from a fresh tree.
182 #
183 # Usage: build-binary.sh [target dir]
184 # The default target directory is the current directory. If it is not
185@@ -16,8 +16,6 @@
186 TARGET="$(uname -m)"
187 TARGET_CFLAGS=''
188 QUIET='VERBOSE=1'
189-CMAKE_BUILD_TYPE='RelWithDebInfo'
190-DEBUG_COMMENT=''
191
192 # Some programs that may be overriden
193 TAR=${TAR:-tar}
194@@ -25,7 +23,7 @@
195 # Check if we have a functional getopt(1)
196 if ! getopt --test
197 then
198- go_out="$(getopt --options="iqd" --longoptions=i686,quiet,debug \
199+ go_out="$(getopt --options="iq" --longoptions=i686,quiet \
200 --name="$(basename "$0")" -- "$@")"
201 test $? -eq 0 || exit 1
202 eval set -- $go_out
203@@ -40,11 +38,6 @@
204 TARGET="i686"
205 TARGET_CFLAGS="-m32 -march=i686"
206 ;;
207- -d | --debug )
208- shift
209- CMAKE_BUILD_TYPE='Debug'
210- DEBUG_COMMENT='-debug'
211- ;;
212 -q | --quiet )
213 shift
214 QUIET=''
215@@ -87,19 +80,32 @@
216 SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
217 test -e "$SOURCEDIR/Makefile" || exit 2
218
219+# Test for the galera sources
220+if ! test -d "$SOURCEDIR/percona-xtradb-cluster-galera"
221+then
222+ echo >&2 "Subdir percona-xtradb-cluster-galera not found"
223+ exit 1
224+fi
225+
226 # Extract version from the Makefile
227 MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \
228 | cut -d = -f 2)"
229+RELEASE_TAG=''
230 PERCONA_SERVER_VERSION="$(grep ^PERCONA_SERVER_VERSION= \
231 "$SOURCEDIR/Makefile" | cut -d = -f 2)"
232-PRODUCT="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
233+WSREP_VERSION="$(grep WSREP_INTERFACE_VERSION \
234+ "$SOURCEDIR/Percona-Server/wsrep/wsrep_api.h" |
235+ cut -d '"' -f2).$(grep 'SET(WSREP_PATCH_VERSION' \
236+ "$SOURCEDIR/Percona-Server/cmake/wsrep.cmake" | cut -d '"' -f2)"
237+PRODUCT="Percona-XtraDB-Cluster-$MYSQL_VERSION"
238
239 # Build information
240-REVISION="$(cd "$SOURCEDIR"; bzr log -r-1 | grep ^revno: | cut -d ' ' -f 2)"
241-PRODUCT_FULL="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
242-PRODUCT_FULL="$PRODUCT_FULL-$REVISION$DEBUG_COMMENT.$(uname -s).$TARGET"
243-COMMENT="Percona Server with XtraDB (GPL), Release $PERCONA_SERVER_VERSION"
244-COMMENT="$COMMENT, Revision $REVISION$DEBUG_COMMENT"
245+REVISION="$(cd "$SOURCEDIR"; bzr revno)"
246+WSREP_REV="$(cd "$SOURCEDIR";test -r WSREP-REVISION && cat WSREP-REVISION || echo "$REVISION")"
247+GALERA_REVISION="$(cd "$SOURCEDIR/percona-xtradb-cluster-galera"; test -r GALERA-REVISION && cat GALERA-REVISION || bzr revno)"
248+PRODUCT_FULL="$PRODUCT-$RELEASE_TAG$WSREP_VERSION.$REVISION.$(uname -s).$TARGET"
249+COMMENT="Percona XtraDB Cluster (GPL) $MYSQL_VERSION-$RELEASE_TAG$WSREP_VERSION"
250+COMMENT="$COMMENT, Revision $REVISION"
251
252 # Compilation flags
253 export CC=${CC:-gcc}
254@@ -108,6 +114,8 @@
255 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:-}"
256 export MAKE_JFLAG=-j4
257
258+export WSREP_REV="$WSREP_REV"
259+
260 # Create a temporary working directory
261 INSTALLDIR="$(cd "$WORKDIR" && TMPDIR="$WORKDIR_ABS" mktemp -d percona-build.XXXXXX)"
262 INSTALLDIR="$WORKDIR_ABS/$INSTALLDIR" # Make it absolute
263@@ -116,17 +124,37 @@
264 (
265 cd "$SOURCEDIR"
266
267- # Execute clean and download mysql, apply patches
268+ # Build galera
269+ (
270+ export CC=${GALERA_CC:-gcc}
271+ export CXX=${GALERA_CXX:-g++}
272+
273+ cd "percona-xtradb-cluster-galera"
274+ scons --config=force revno="$GALERA_REVISION" garb/garbd libgalera_smm.so
275+ mkdir -p "$INSTALLDIR/usr/local/$PRODUCT_FULL/bin" \
276+ "$INSTALLDIR/usr/local/$PRODUCT_FULL/lib"
277+ cp garb/garbd "$INSTALLDIR/usr/local/$PRODUCT_FULL/bin"
278+ cp libgalera_smm.so "$INSTALLDIR/usr/local/$PRODUCT_FULL/lib"
279+
280+ ) || exit 1
281+
282+ # Export and cd to a new dir
283+ bzr export "$INSTALLDIR/src"
284+
285+ cd "$INSTALLDIR/src"
286+
287 make clean all
288+ cd Percona-Server
289
290- cd "$PRODUCT"
291 cmake . -DBUILD_CONFIG=mysql_release \
292- -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \
293+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
294 -DWITH_EMBEDDED_SERVER=OFF \
295 -DFEATURE_SET=community \
296 -DCMAKE_INSTALL_PREFIX="/usr/local/$PRODUCT_FULL" \
297 -DMYSQL_DATADIR="/usr/local/$PRODUCT_FULL/data" \
298- -DMYSQL_SERVER_SUFFIX="-$PERCONA_SERVER_VERSION" \
299+ -DMYSQL_SERVER_SUFFIX="-$RELEASE_TAG$WSREP_VERSION" \
300+ -DWITH_INNODB_DISALLOW_WRITES=ON \
301+ -DWITH_WSREP=ON \
302 -DCOMPILATION_COMMENT="$COMMENT"
303
304 make $MAKE_JFLAG $QUIET
305@@ -136,8 +164,8 @@
306 (
307 cd "storage/HandlerSocket-Plugin-for-MySQL"
308 ./autogen.sh
309- CXX=${HS_CXX:-g++} ./configure --with-mysql-source="$SOURCEDIR/$PRODUCT" \
310- --with-mysql-bindir="$SOURCEDIR/$PRODUCT/scripts" \
311+ CXX=${HS_CXX:-g++} ./configure --with-mysql-source="$INSTALLDIR/src/Percona-Server" \
312+ --with-mysql-bindir="$INSTALLDIR/src/Percona-Server/scripts" \
313 --with-mysql-plugindir="/usr/local/$PRODUCT_FULL/lib/mysql/plugin" \
314 --libdir="/usr/local/$PRODUCT_FULL/lib/mysql/plugin" \
315 --prefix="/usr/local/$PRODUCT_FULL"
316@@ -149,7 +177,7 @@
317 # Build UDF
318 (
319 cd "UDF"
320- CXX=${UDF_CXX:-g++} ./configure --includedir="$SOURCEDIR/$PRODUCT/include" \
321+ CXX=${UDF_CXX:-g++} ./configure --includedir="$INSTALLDIR/src/Percona-Server/include" \
322 --libdir="/usr/local/$PRODUCT_FULL/mysql/plugin"
323 make
324 make DESTDIR="$INSTALLDIR" install
325
326=== modified file 'build/build-dpkg.sh'
327--- build/build-dpkg.sh 2012-12-22 02:14:09 +0000
328+++ build/build-dpkg.sh 2013-01-18 18:35:38 +0000
329@@ -12,14 +12,13 @@
330 set -ue
331
332 # Examine parameters
333-go_out="$(getopt --options "kK:bD" --longoptions key:,nosign,binary,nodebug \
334+go_out="$(getopt --options "kK:bB" --longoptions key:,nosign,binary,binarydep \
335 --name "$(basename "$0")" -- "$@")"
336 test $? -eq 0 || exit 1
337 eval set -- $go_out
338
339 BUILDPKG_KEY=''
340 BINARY=''
341-DEBUG='yes'
342
343 for arg
344 do
345@@ -28,7 +27,7 @@
346 -k | --key ) shift; BUILDPKG_KEY="-pgpg -k$1"; shift;;
347 -K | --nosign ) shift; BUILDPKG_KEY="-uc -us";;
348 -b | --binary ) shift; BINARY='-b';;
349- -D | --nodebug ) shift; DEBUG='';;
350+ -B | --binarydep ) shift; BINARY='-B';;
351 esac
352 done
353
354@@ -68,14 +67,17 @@
355 # Extract version from the Makefile
356 MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile" \
357 | cut -d = -f 2)"
358+WSREP_VERSION="$(grep WSREP_INTERFACE_VERSION "$SOURCEDIR/Percona-Server/wsrep/wsrep_api.h" |
359+ cut -d '"' -f2).$(grep 'SET(WSREP_PATCH_VERSION' \
360+ "$SOURCEDIR/Percona-Server/cmake/wsrep.cmake" | cut -d '"' -f2)"
361 PERCONA_SERVER_VERSION="$(grep ^PERCONA_SERVER_VERSION= "$SOURCEDIR/Makefile" | cut -d = -f 2)"
362-PRODUCT="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
363+PRODUCT="Percona-XtraDB-Cluster-$MYSQL_VERSION"
364 DEBIAN_VERSION="$(lsb_release -sc)"
365
366-
367 # Build information
368-export BB_PERCONA_REVISION="$(cd "$SOURCEDIR"; bzr revno)"
369-export DEB_BUILD_OPTIONS='debug nocheck'
370+export REVISION="$(cd "$SOURCEDIR"; bzr revno)"
371+export WSREP_REV="$(cd "$SOURCEDIR";test -r WSREP-REVISION && cat WSREP-REVISION || echo "$REVISION")"
372+export DEB_BUILD_OPTIONS='nostrip debug nocheck'
373
374 # Compilation flags
375 export CC=${CC:-gcc}
376@@ -104,17 +106,10 @@
377 cp -R "$SOURCEDIR/build/debian" .
378 chmod +x debian/rules
379
380- # If debug is not set, do not ship mysql-debug
381- if test "x$DEBUG" = "x"
382- then
383- sed -i '/mysqld-debug/d' debian/percona-server-server-5.5.install
384- fi
385-
386 # Update distribution name
387- dch -m -D "$DEBIAN_VERSION" --force-distribution -v "$MYSQL_VERSION-$PERCONA_SERVER_VERSION-$BB_PERCONA_REVISION.$DEBIAN_VERSION" 'Update distribution'
388+ dch -m -D "$DEBIAN_VERSION" --force-distribution -v "$MYSQL_VERSION-$WSREP_VERSION-$REVISION.$DEBIAN_VERSION" 'Update distribution'
389
390 DEB_CFLAGS_APPEND="$CFLAGS" DEB_CXXFLAGS_APPEND="$CXXFLAGS" \
391- BUILD_DEBUG_BINARY="$DEBUG" \
392 dpkg-buildpackage $BINARY -rfakeroot $BUILDPKG_KEY
393
394 )
395
396=== modified file 'build/build-shared-compat-rpm.sh'
397--- build/build-shared-compat-rpm.sh 2012-12-22 02:14:09 +0000
398+++ build/build-shared-compat-rpm.sh 2013-01-18 18:35:38 +0000
399@@ -101,10 +101,6 @@
400 "$SOURCEDIR/Makefile" | cut -d = -f 2)"
401 PRODUCT="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
402
403-# Extract version of the 5.1 branch, to get .so.16 from there.
404-MYSQL_VERSION51="$(grep '^%define version51 ' \
405- "$SOURCEDIR/build/percona-shared-compat.spec" | cut -d ' ' -f3)"
406-
407 # Build information
408 REDHAT_RELEASE="$(grep -o 'release [0-9][0-9]*' /etc/redhat-release | \
409 cut -d ' ' -f 2)"
410@@ -135,8 +131,7 @@
411 RPMVER=i386
412 fi
413
414- wget -c "http://www.percona.com/downloads/community/shared-compat/MySQL-shared-compat-$MYSQL_VERSION-1.linux2.6.$RPMVER.rpm"
415- wget -c "http://www.percona.com/downloads/community/shared-compat/Percona-Server-shared-51-$MYSQL_VERSION51.rhel$REDHAT_RELEASE.$RPMVER.rpm"
416+ wget "http://www.percona.com/downloads/community/shared-compat/MySQL-shared-compat-$MYSQL_VERSION-1.linux2.6.$RPMVER.rpm"
417
418 )
419
420
421=== modified file 'build/debian/control'
422--- build/debian/control 2012-12-22 02:14:09 +0000
423+++ build/debian/control 2013-01-18 18:35:38 +0000
424@@ -1,35 +1,26 @@
425-Source: percona-server-5.5
426+Source: percona-xtradb-cluster-5.5
427 Section: database
428 Priority: extra
429 Maintainer: Percona Server Development Team <mysql-dev@percona.com>
430-Uploaders: Aleksandr Kuzminsky <aleksandr.kuzminsky@percona.com>
431-Build-Depends: debhelper (>= 7.0.50), cmake, libtool, autoconf, libncurses5-dev, perl, bison, fakeroot, devscripts, libaio-dev, libpam-dev
432-Standards-Version: 7.0.0
433-Homepage: http://www.percona.com/software/percona-server/
434-Vcs-Bzr: bzr+ssh://bazaar.launchpad.net/~percona-dev/percona-server/release-5.5.8-20/
435-Vcs-Browser: http://bazaar.launchpad.net/~percona-dev/percona-server/release-5.5.8-20/files
436+Uploaders: Ignacio Nin <ignacio.nin@percona.com>
437+Build-Depends: debhelper (>= 7.0), cmake, libtool, autoconf, libncurses5-dev, perl, bison, fakeroot, devscripts, libaio-dev
438+Standards-Version: 3.9.1
439+Homepage: http://www.percona.com/software/percona-xtradb-cluster/
440
441 Package: libmysqlclient18
442 Section: libs
443 Architecture: any
444 Replaces: libpercona-server-client18
445 Depends: ${misc:Depends}
446-Description: Percona Server database client library
447- Percona Server is a fast, stable and true multi-user,
448- multi-threaded SQL database server. SQL (Structured Query Language)
449- is the most popular database query language in the world. The main
450- goals of Percona Server are speed, robustness and ease of use.
451+Description: Percona XtraDB Cluster database client library
452+ Percona XtraDB Cluster is based on the Percona Server database
453+ server and provides a High Availability solution.
454+ Percona XtraDB Cluster provides synchronous replication, supports
455+ multi-master replication, parallel applying on slaves, automatic
456+ node provisioning with primary focus on data consistency.
457 .
458 This package includes the client library.
459
460-Package: libmysqlclient18-dev
461-Architecture: any
462-Section: libdevel
463-Depends: libmysqlclient-dev (= ${binary:Version}), ${misc:Depends}
464-Description: Percona Server database development files - empty transitional
465- package. This is an empty package that depends on libmysqlclient-dev to ease
466- the transition for packages with versioned build-deps on libmysqlclient18-dev.
467-
468 Package: libmysqlclient-dev
469 Architecture: any
470 Section: libdevel
471@@ -37,109 +28,75 @@
472 Conflicts: libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev, libmysqlclient15-dev, libmysqlclient16-dev
473 Replaces: libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev, libmysqlclient15-dev, libmysqlclient16-dev, libpercona-xtradb-client-dev
474 Description: Percona Server database development files
475- Percona Server is a fast, stable and true multi-user, multi-threaded SQL
476- database server. SQL (Structured Query Language) is the most popular
477- database query language in the world. The main goals of Percona Server are
478- speed, robustness and ease of use.
479+ Percona XtraDB Cluster is based on the Percona Server database
480+ server and provides a High Availability solution.
481+ Percona XtraDB Cluster provides synchronous replication, supports
482+ multi-master replication, parallel applying on slaves, automatic
483+ node provisioning with primary focus on data consistency.
484 .
485 This package includes development libraries and header files.
486
487-Package: percona-server-common-5.5
488+Package: percona-xtradb-cluster-common-5.5
489 Section: database
490-Architecture: any
491+Architecture: all
492 Depends: ${misc:Depends}
493-Conflicts: mysql-common-4.1, mysql-common-5.0, mysql-common-5.1, mysql-common, percona-server-common-5.1
494+Conflicts: mysql-common-4.1, mysql-common-5.0, mysql-common-5.1, mysql-common
495 Provides: mysql-common
496-Replaces: mysql-common-4.1, mysql-common-5.0, mysql-common-5.1, mysql-common, percona-server-common-5.1
497+Replaces: mysql-common-4.1, mysql-common-5.0, mysql-common-5.1, mysql-common
498 Description: Percona Server database common files (e.g. /etc/mysql/my.cnf)
499- Percona Server is a fast, stable and true multi-user, multi-threaded SQL
500- database server. SQL (Structured Query Language) is the most popular database
501- query language in the world. The main goals of Percona Server are speed,
502- robustness and ease of use.
503+ Percona XtraDB Cluster is based on the Percona Server database
504+ server and provides a High Availability solution.
505+ Percona XtraDB Cluster provides synchronous replication, supports
506+ multi-master replication, parallel applying on slaves, automatic
507+ node provisioning with primary focus on data consistency.
508 .
509 This package includes files needed by all versions of the client library
510 (e.g. /etc/mysql/my.cnf).
511
512-Package: percona-server-client-5.5
513+Package: percona-xtradb-cluster-test-5.5
514+Architecture: all
515+Depends: percona-xtradb-cluster-client-5.5 (>= ${source:Version}), percona-xtradb-cluster-server-5.5 (>= ${source:Version})
516+Provides: mysql-test
517+Description: Percona Server database test suite
518+ Percona XtraDB Cluster is based on the Percona Server database
519+ server and provides a High Availability solution.
520+ Percona XtraDB Cluster provides synchronous replication, supports
521+ multi-master replication, parallel applying on slaves, automatic
522+ node provisioning with primary focus on data consistency.
523+ .
524+ This package includes the Percona Server test framework that provides
525+ a means for verifying that Percona Server and its client programs
526+ operate according to expectations
527+
528+Package: percona-xtradb-cluster-client-5.5
529 Architecture: any
530-Depends: debianutils (>=1.6), libdbi-perl, percona-server-common-5.5 (>= ${source:Version}), libmysqlclient18 (>= ${source:Version}), ${shlib:Depends}, ${misc:Depends}
531-Provides: mysql-client, mysql-client-core, mysql-client-5.5, mysql-client-core-5.5, virtual-mysql-client
532-Conflicts: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1, mysql-client-core-5.1, mysql-client-5.5, mysql-client-core-5.5, percona-xtradb-client-5.0, percona-server-client-5.1
533-Replaces: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1, mysql-client-core-5.1, mysql-client-5.5, mysql-client-core-5.5, percona-xtradb-client-5.0, percona-server-client-5.1
534+Depends: debianutils (>=1.6), libdbi-perl, percona-xtradb-cluster-common-5.5 (>= ${source:Version}), libmysqlclient18 (>= ${source:Version}), ${shlib:Depends}, ${misc:Depends}
535+Provides: mysql-client, virtual-mysql-client
536+Conflicts: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1, mysql-client-core-5.1, percona-xtradb-client-5.0, percona-xtradb-cluster-client-5.1
537+Replaces: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1, mysql-client-core-5.1, percona-xtradb-client-5.0, percona-xtradb-cluster-client-5.1
538 Description: Percona Server database client binaries
539- Percona Server is a fast, stable and true multi-user, multi-threaded SQL
540- database server. SQL (Structured Query Language) is the most popular database
541- query language in the world. The main goals of Percona Server are speed,
542- robustness and ease of use.
543+ Percona XtraDB Cluster is based on the Percona Server database
544+ server and provides a High Availability solution.
545+ Percona XtraDB Cluster provides synchronous replication, supports
546+ multi-master replication, parallel applying on slaves, automatic
547+ node provisioning with primary focus on data consistency.
548 .
549 This package includes the client binaries and the additional tools
550 innotop and mysqlreport.
551
552-Package: percona-server-server-5.5
553+Package: percona-xtradb-cluster-server-5.5
554 Architecture: any
555 Suggests: tinyca
556-Depends: percona-server-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), percona-server-common-5.5 (>= ${source:Version}), adduser (>= 3.40), debconf
557-Conflicts: mysql-server (<< ${source:Version}), mysql-server-4.1, mysql-server-5.5, mysql-server-core-5.1, mysql-server-core-5.5, percona-xtradb-server-5.0, percona-server-server-5.1
558-Provides: mysql-server, mysql-server-core, mysql-server-5.5, mysql-server-core-5.5
559-Replaces: mysql-server (<< ${source:Version}), mysql-server-5.0, mysql-server-core-5.1, mysql-server-core-5.5, percona-xtradb-server-5.0, percona-server-server-5.1
560+Depends: percona-xtradb-cluster-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), percona-xtradb-cluster-common-5.5 (>= ${source:Version}), percona-xtradb-cluster-galera, adduser (>= 3.40), debconf, percona-xtrabackup (>= 1.9.0), tar, netcat-openbsd, rsync
561+Conflicts: mysql-server (<< ${source:Version}), mysql-server-4.1, mysql-server-core-5.1, percona-xtradb-server-5.0, percona-xtradb-cluster-server-5.1
562+Provides: mysql-server
563+Replaces: mysql-server (<< ${source:Version}), mysql-server-5.0, mysql-server-core-5.1, percona-xtradb-server-5.0, percona-xtradb-cluster-server-5.1
564 Description: Percona Server database server binaries
565- Percona Server is a fast, stable and true multi-user, multi-threaded SQL
566- database server. SQL (Structured Query Language) is the most popular database
567- query language in the world. The main goals of Percona Server are speed,
568- robustness and ease of use.
569+ Percona XtraDB Cluster is based on the Percona Server database
570+ server and provides a High Availability solution.
571+ Percona XtraDB Cluster provides synchronous replication, supports
572+ multi-master replication, parallel applying on slaves, automatic
573+ node provisioning with primary focus on data consistency.
574 .
575 This package includes the server binaries.
576
577-Package: percona-server-server
578-Section: database
579-Architecture: any
580-Depends: percona-server-server-5.5, ${misc:Depends}
581-Description: Percona Server database server
582- (metapackage depending on the latest version)
583- This is an empty package that depends on the current "best" version of
584- percona-server-server (currently percona-server-server-5.5), as determined
585- by the Percona Server maintainers. Install this package if in doubt
586- about which Percona Server version you need. That will install the version
587- recommended by the package maintainers.
588- .
589- Percona Server is a fast, stable and true multi-user, multi-threaded SQL
590- database server. SQL (Structured Query Language) is the most popular database
591- query language in the world. The main goals of Percona Server are speed,
592- robustness and ease of use.
593-
594-Package: percona-server-client
595-Section: database
596-Architecture: any
597-Depends: percona-server-client-5.5, ${misc:Depends}
598-Description: Percona Server database client
599- (metapackage depending on the latest version)
600- This is an empty package that depends on the current "best" version of
601- percona-server-client (currently percona-server-client-5.5), as determined
602- by the Percona Server maintainers. Install this package if in doubt
603- about which Percona Server version you want, as this is the one we consider
604- to be in the best shape.
605-
606-Package: percona-server-test-5.5
607-Architecture: any
608-Depends: percona-server-client-5.5 (>= ${source:Version}), percona-server-server-5.5 (>= ${source:Version})
609-Description: Percona Server database test suite
610- Percona Server is a fast, stable and true multi-user, multi-threaded SQL
611- database server. SQL (Structured Query Language) is the most popular database
612- query language in the world. The main goals of Percona Server are speed,
613- robustness and ease of use.
614- .
615- This package includes the Percona Server test framework that provides
616- a means for verifying that Percona Server and its client programs
617- operate according to expectations
618-
619-Package: percona-server-5.5-dbg
620-Architecture: any
621-Section: debug
622-Depends: percona-server-server-5.5 (= ${binary:Version}), ${misc:Depends}
623-Description: Debugging package for Percona Server
624- Percona Server is a fast, stable and true multi-user, multi-threaded SQL
625- database server. SQL (Structured Query Language) is the most popular database
626- query language in the world. The main goals of Percona Server are speed,
627- robustness and ease of use.
628- .
629- This package contains the debugging symbols for the Percona Server binaries.
630
631=== removed file 'build/debian/percona-server-server-5.5.docs'
632--- build/debian/percona-server-server-5.5.docs 2012-10-01 18:09:39 +0000
633+++ build/debian/percona-server-server-5.5.docs 1970-01-01 00:00:00 +0000
634@@ -1,8 +0,0 @@
635-Docs/sp-imp-spec.txt
636-Docs/myisam.txt
637-README
638-COPYING*
639-Docs/INSTALL-BINARY
640-Docs/mysql.info
641-release/Docs/INFO_BIN
642-release/Docs/INFO_SRC
643
644=== removed file 'build/debian/percona-server-server-5.5.install'
645--- build/debian/percona-server-server-5.5.install 2012-10-01 18:10:09 +0000
646+++ build/debian/percona-server-server-5.5.install 1970-01-01 00:00:00 +0000
647@@ -1,56 +0,0 @@
648-usr/lib/mysql/plugin
649-usr/bin/innochecksum
650-usr/bin/msql2mysql
651-usr/bin/my_print_defaults
652-usr/bin/myisamchk
653-usr/bin/myisamlog
654-usr/bin/myisampack
655-usr/bin/mysql_convert_table_format
656-usr/bin/mysql_install_db
657-usr/bin/mysql_secure_installation
658-usr/bin/mysql_setpermission
659-usr/bin/mysql_tzinfo_to_sql
660-usr/bin/mysql_upgrade
661-usr/bin/mysql_plugin
662-usr/bin/mysql_zap
663-usr/bin/mysqlbinlog
664-usr/bin/mysqld_multi
665-usr/bin/mysqld_safe
666-usr/bin/mysqlhotcopy
667-usr/bin/mysqltest
668-usr/bin/perror
669-usr/bin/replace
670-usr/bin/resolve_stack_dump
671-usr/bin/resolveip
672-usr/sbin/mysqld
673-usr/sbin/mysqld-debug
674-usr/share/man/man1/msql2mysql.1
675-usr/share/man/man1/myisamchk.1
676-usr/share/man/man1/myisamlog.1
677-usr/share/man/man1/myisampack.1
678-usr/share/man/man1/my_print_defaults.1
679-usr/share/man/man1/mysqlbinlog.1
680-usr/share/man/man1/mysql_convert_table_format.1
681-usr/share/man/man1/mysqld_multi.1
682-usr/share/man/man1/mysqld_safe.1
683-usr/share/man/man1/mysqlhotcopy.1
684-usr/share/man/man1/mysql_install_db.1
685-usr/share/man/man1/mysql_secure_installation.1
686-usr/share/man/man1/mysql_setpermission.1
687-usr/share/man/man1/mysql_upgrade.1
688-usr/share/man/man1/mysqltest.1
689-usr/share/man/man1/mysql_zap.1
690-usr/share/man/man1/perror.1
691-usr/share/man/man1/replace.1
692-usr/share/man/man1/resolveip.1
693-usr/share/man/man1/mysql_plugin.1
694-usr/share/man/man1/resolve_stack_dump.1
695-usr/share/man/man1/innochecksum.1
696-usr/share/man/man1/mysql_tzinfo_to_sql.1
697-usr/share/man/man1/mysql.server.1
698-usr/share/man/man1/comp_err.1
699-usr/share/man/man1/mysqlman.1
700-usr/share/man/man8/mysqld.8
701-usr/share/mysql/
702-debian/additions/debian-start etc/mysql/
703-debian/additions/debian-start.inc.sh usr/share/mysql
704
705=== modified file 'build/debian/rules' (properties changed: -x to +x)
706--- build/debian/rules 2012-12-22 02:14:09 +0000
707+++ build/debian/rules 2013-01-18 18:35:38 +0000
708@@ -9,9 +9,9 @@
709
710 feature_set="community"
711 major_version=29
712-minor_version=2
713-compilation_comment_release="Percona Server (GPL), Release $(major_version).$(minor_version)"
714-server_suffix="-$(major_version).$(minor_version)"
715+minor_version=1
716+compilation_comment_release="Percona XtraDB Cluster (GPL)"
717+server_suffix="-55"
718 prefix="/usr"
719
720 clean: clean-patched unpatch
721@@ -20,45 +20,27 @@
722 dh clean
723 rm -rf CMakeFiles
724
725-override_dh_auto_configure: patch
726-ifneq ($(BUILD_DEBUG_BINARY),)
727- # Make a debug binary
728- mkdir debug
729- cd debug && \
730- $(CMAKE) ../ -DBUILD_CONFIG=mysql_release \
731- -DINSTALL_LAYOUT=DEB \
732- -DCMAKE_BUILD_TYPE=Debug \
733- -DWITH_EMBEDDED_SERVER=OFF \
734- -DMYSQL_UNIX_ADDR="/var/run/mysqld/mysqld.sock" \
735- -DFEATURE_SET=$(feature_set) \
736- -DCOMPILATION_COMMENT=$(compilation_comment_debug) \
737- -DMYSQL_SERVER_SUFFIX=$(server_suffix)
738-endif
739-
740- mkdir release
741- cd release && $(CMAKE) ../ -DBUILD_CONFIG=mysql_release \
742+build: patch
743+ dh_testdir
744+ $(CMAKE) . -DBUILD_CONFIG=mysql_release \
745 -DINSTALL_LAYOUT=DEB \
746 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
747 -DWITH_EMBEDDED_SERVER=OFF \
748+ -DWITH_INNODB_DISALLOW_WRITES=ON \
749+ -DWITH_WSREP=ON \
750 -DMYSQL_UNIX_ADDR="/var/run/mysqld/mysqld.sock" \
751 -DFEATURE_SET=$(feature_set) \
752 -DCOMPILATION_COMMENT=$(compilation_comment_release) \
753 -DMYSQL_SERVER_SUFFIX=$(server_suffix)
754-
755-override_dh_auto_build:
756-ifneq ($(BUILD_DEBUG_BINARY),)
757- cd debug && make $(MAKE_JFLAG)
758-endif
759-
760- cd release && make $(MAKE_JFLAG)
761+ make $(MAKE_JFLAG)
762
763 # Build HandlerSocket
764 echo "Configuring HandlerSocket"
765 cd storage/HandlerSocket-Plugin-for-MySQL && \
766 bash -x autogen.sh && \
767- CXX=g++ CXXFLAGS="$(CXXFLAGS) -I$(CURDIR)/release/include" \
768+ CXX="$${HS_CXX:-g++}" CXXFLAGS="$(CXXFLAGS) -I$(CURDIR)/include" \
769 ./configure --with-mysql-source=$(CURDIR) \
770- --with-mysql-bindir=$(CURDIR)/release/scripts \
771+ --with-mysql-bindir=$(CURDIR)/scripts \
772 --with-mysql-plugindir=$(prefix)/lib/mysql/plugin \
773 --libdir=$(prefix)/lib \
774 --prefix=$(prefix) && \
775@@ -66,34 +48,50 @@
776
777 # Build UDF
778 cd UDF && \
779- CXX=g++ CXXFLAGS="$(CXXFLAGS) -I$(CURDIR)/release/include" \
780+ CXX="$${UDF_CXX:-g++}" CXXFLAGS="$(CXXFLAGS) -I$(CURDIR)/include" \
781 ./configure --includedir=$(CURDIR)/include \
782 --libdir=$(prefix)/lib/mysql/plugin && \
783 make $(MAKE_JFLAG)
784
785-build:
786- dh build
787+ dh_auto_test
788
789 binary:
790- dh -Brelease binary
791+ echo "Making binary"
792+ dh --before dh_auto_install binary
793+ dh_auto_install
794+ cd storage/HandlerSocket-Plugin-for-MySQL && make DESTDIR=$(TMP) install
795+ cd UDF && make DESTDIR=$(TMP) install
796+ dh --after dh_auto_install --before dh_installinit binary
797+ dh_installinit --name=mysql
798+ dh --after dh_installinit binary
799+
800
801 binary-arch:
802- dh -Brelease binary-arch
803+ echo "Making binary"
804+ dh --before dh_auto_install binary-arch
805+ dh_auto_install
806+ cd storage/HandlerSocket-Plugin-for-MySQL && make DESTDIR=$(TMP) install
807+ cd UDF && make DESTDIR=$(TMP) install
808+ dh --after dh_auto_install --before dh_installinit binary-arch
809+ dh_installinit --name=mysql
810+ dh --after dh_installinit binary-arch
811
812 binary-indep:
813- dh -Brelease binary-indep
814+ echo "Making binary"
815+ dh --before dh_auto_install binary-indep
816+ dh_auto_install
817+ cd storage/HandlerSocket-Plugin-for-MySQL && make DESTDIR=$(TMP) install
818+ cd UDF && make DESTDIR=$(TMP) install
819+ dh --after dh_auto_install --before dh_installinit binary-indep
820+ dh_installinit --name=mysql
821+ dh --after dh_installinit binary-indep
822
823 install:
824- dh install
825-
826-override_dh_auto_install:
827+ echo "Making binary"
828+ dh --before dh_auto_install install
829 dh_auto_install
830 cd storage/HandlerSocket-Plugin-for-MySQL && make DESTDIR=$(TMP) install
831 cd UDF && make DESTDIR=$(TMP) install
832-
833-override_dh_installinit:
834+ dh --after dh_auto_install --before dh_installinit install
835 dh_installinit --name=mysql
836-
837-override_dh_strip:
838- dh_strip --dbg-package=percona-server-5.5-dbg
839-
840+ dh --after dh_installinit install
841
842=== removed file 'build/percona-shared-compat.spec'
843--- build/percona-shared-compat.spec 2012-10-24 03:26:27 +0000
844+++ build/percona-shared-compat.spec 1970-01-01 00:00:00 +0000
845@@ -1,93 +0,0 @@
846-#
847-# percona-shared-compat.spec
848-#
849-# Based on MySQL-shared-compat.spec, which is Copyright (C) 2003 MySQL AB
850-#
851-# RPM build instructions to create a "meta" package that includes different
852-# versions of the MySQL shared libraries (for compatibility with
853-# distributions that ship older versions of MySQL).
854-#
855-# In this version we simply repackage mysql-shared-compat from upstream.
856-#
857-# This program is free software; you can redistribute it and/or modify it
858-# under the terms of the GNU General Public License as published by the Free
859-# Software Foundation; version 2 of the License.
860-#
861-# This program is distributed in the hope that it will be useful, but
862-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
863-# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
864-# for more details.
865-#
866-# You should have received a copy of the GNU General Public License along
867-# with this program; if not, write to the Free Software Foundation, Inc., 59
868-# Temple Place, Suite 330, Boston, MA 02111-1307 USA
869-
870-# For 5.0 and up, this is needed because of "libndbclient".
871-%define _unpackaged_files_terminate_build 0
872-
873-#
874-# Change this to match the version of the shared libs you want to include
875-#
876-%define version55 5.5.28
877-%define version51 5.1.66
878-%define version50 5.0.91
879-%define version41 4.1.22
880-%define version40 4.0.27
881-#%define version3 3.23.58
882-
883-%define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
884-
885-Name: Percona-Server-shared-compat
886-Packager: Percona MySQL Development Team <mysql-dev@percona.com>
887-Vendor: Percona Inc
888-License: GPL v2
889-Group: Applications/Databases
890-URL: http://www.percona.com/percona-lab.html
891-Autoreqprov: on
892-Version: %{version55}
893-Release: %{release}.%{gotrevision}.rhel%{redhatversion}
894-BuildRoot: %{_tmppath}/%{name}-%{version}-build
895-Obsoletes: MySQL-shared mysql-libs
896-Provides: MySQL-shared mysql-libs
897-Summary: MySQL shared client libraries for MySQL %{version}, %{version50}, %{version41} and %{version40}
898-
899-# We extract the older libraries from mysql-shared-compat and the newer from our sources
900-Source0: MySQL-shared-compat-%{version55}-1.linux2.6.%{_arch}.rpm
901-Source1: Percona-Server-shared-51-%{version51}.rhel%{redhatversion}.%{_arch}.rpm
902-#Source1: MySQL-shared-%{version50}-1.%{_arch}.rpm
903-#Source2: MySQL-shared-%{version41}-0.%{_arch}.rpm
904-#Source3: MySQL-shared-%{version40}-0.%{_arch}.rpm
905-#Source3: MySQL-shared-%{version3}-1.%{_arch}.rpm
906-# No need to include the RPMs once more - they can be downloaded seperately
907-# if you want to rebuild this package
908-NoSource: 0
909-NoSource: 1
910-#NoSource: 2
911-#NoSource: 3
912-BuildRoot: %{_tmppath}/%{name}-%{version}-build
913-
914-%description
915-This package includes the shared libraries for MySQL 4.0, 4.1, 5.0 and 5.1.
916-Install this package instead of "MySQL-shared", if you have applications
917-installed that are dynamically linked against older versions of the MySQL
918-client library but you want to upgrade to MySQL %{version} without breaking the
919-library dependencies.
920-
921-%install
922-[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
923-mkdir -p $RPM_BUILD_ROOT
924-cd $RPM_BUILD_ROOT
925-rpm2cpio %{SOURCE0} | cpio -iv --make-directories
926-#rpm2cpio %{SOURCE1} | cpio -iv --make-directories
927-#rpm2cpio %{SOURCE2} | cpio -iv --make-directories
928-#rpm2cpio %{SOURCE3} | cpio -iv --make-directories
929-rpm2cpio %{SOURCE1} | cpio -ivu '*/usr/lib64/libmysqlclient*so.16*'
930-/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
931-
932-%clean
933-[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
934-
935-%files
936-%defattr(-, root, root)
937-%{_libdir}/libmysqlclient*
938-
939
940=== modified file 'build/percona-xtradb-cluster.spec'
941--- build/percona-xtradb-cluster.spec 2012-12-22 02:14:09 +0000
942+++ build/percona-xtradb-cluster.spec 2013-01-18 18:35:38 +0000
943@@ -28,7 +28,7 @@
944 %define mysql_version 5.5.28
945 %define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
946 %define majorversion 29
947-%define minorversion 2
948+%define minorversion 1
949 %define distribution rhel%{redhatversion}
950 %define percona_server_version %{wsrep_version}
951
952@@ -997,6 +997,7 @@
953 %doc %attr(644, root, root) %{_infodir}/mysql.info*
954
955 %doc %attr(644, root, man) %{_mandir}/man1/innochecksum.1*
956+%doc %attr(644, root, man) %{_mandir}/man1/my_print_defaults.1*
957 %doc %attr(644, root, man) %{_mandir}/man1/myisam_ftdump.1*
958 %doc %attr(644, root, man) %{_mandir}/man1/myisamchk.1*
959 %doc %attr(644, root, man) %{_mandir}/man1/myisamlog.1*
960@@ -1026,6 +1027,7 @@
961
962 %attr(755, root, root) %{_bindir}/clustercheck
963 %attr(755, root, root) %{_bindir}/innochecksum
964+%attr(755, root, root) %{_bindir}/my_print_defaults
965 %attr(755, root, root) %{_bindir}/myisam_ftdump
966 %attr(755, root, root) %{_bindir}/myisamchk
967 %attr(755, root, root) %{_bindir}/myisamlog
968@@ -1123,7 +1125,6 @@
969 %defattr(-, root, root, 0755)
970 %attr(755, root, root) %{_bindir}/msql2mysql
971 %attr(755, root, root) %{_bindir}/mysql
972-%attr(755, root, root) %{_bindir}/my_print_defaults
973 %attr(755, root, root) %{_bindir}/mysql_find_rows
974 %attr(755, root, root) %{_bindir}/mysql_waitpid
975 %attr(755, root, root) %{_bindir}/mysqlaccess
976@@ -1140,7 +1141,6 @@
977
978 %doc %attr(644, root, man) %{_mandir}/man1/msql2mysql.1*
979 %doc %attr(644, root, man) %{_mandir}/man1/mysql.1*
980-%doc %attr(644, root, man) %{_mandir}/man1/my_print_defaults.1*
981 %doc %attr(644, root, man) %{_mandir}/man1/mysql_find_rows.1*
982 %doc %attr(644, root, man) %{_mandir}/man1/mysql_waitpid.1*
983 %doc %attr(644, root, man) %{_mandir}/man1/mysqlaccess.1*

Subscribers

People subscribed via source and target branches