Percona XtraBackup moved to https://jira.percona.com/projects/PXB

Merge lp:~percona-core/percona-xtrabackup/release-2.0.7 into lp:percona-xtrabackup/2.0

  1. release-2.0.7
  2. Merge into 2.0
Proposed by Ignacio Nin
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 558
Proposed branch: lp:~percona-core/percona-xtrabackup/release-2.0.7
Merge into: lp:percona-xtrabackup/2.0
Diff against target: 73 lines (+7/-7)
6 files modified
VERSION (+1/-1)
utils/build-binary.sh (+1/-1)
utils/build-dpkg.sh (+1/-1)
utils/build-rpm.sh (+1/-1)
utils/debian/control (+2/-2)
utils/xtrabackup.spec (+1/-1)
To merge this branch: bzr merge lp:~percona-core/percona-xtrabackup/release-2.0.7
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+162704@code.launchpad.net

Description of the change

Changes for release 2.0.7

This includes changes needed for wheezy/raring

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'VERSION'
2--- VERSION 2013-03-15 16:51:14 +0000
3+++ VERSION 2013-05-07 04:38:29 +0000
4@@ -1,1 +1,1 @@
5-XTRABACKUP_VERSION=2.0.6
6+XTRABACKUP_VERSION=2.0.7
7
8=== modified file 'utils/build-binary.sh'
9--- utils/build-binary.sh 2013-04-23 08:25:42 +0000
10+++ utils/build-binary.sh 2013-05-07 04:38:29 +0000
11@@ -87,7 +87,7 @@
12 export CC=${CC:-gcc}
13 export CXX=${CXX:-g++}
14 export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -DXTRABACKUP_REVISION=\\\"$REVISION\\\" ${CFLAGS:-}"
15-export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions -DXTRABACKUP_REVISION=\\\"$REVISION\\\" ${CXXFLAGS:-}"
16+export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -DXTRABACKUP_REVISION=\\\"$REVISION\\\" ${CXXFLAGS:-}"
17 export MAKE_JFLAG=-j4
18
19 # Create a temporary working directory
20
21=== modified file 'utils/build-dpkg.sh'
22--- utils/build-dpkg.sh 2013-04-25 08:20:34 +0000
23+++ utils/build-dpkg.sh 2013-05-07 04:38:29 +0000
24@@ -80,7 +80,7 @@
25 export CC=${CC:-gcc}
26 export CXX=${CXX:-g++}
27 export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer"
28-export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions"
29+export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2"
30 export MAKE_JFLAG=-j4
31
32 export DEB_BUILD_OPTIONS='debug nocheck'
33
34=== modified file 'utils/build-rpm.sh'
35--- utils/build-rpm.sh 2013-04-23 08:25:42 +0000
36+++ utils/build-rpm.sh 2013-05-07 04:38:29 +0000
37@@ -116,7 +116,7 @@
38 export CC=${CC:-gcc}
39 export CXX=${CXX:-g++}
40 export CFLAGS="-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer $TARGET_CFLAGS"
41-export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fno-exceptions $TARGET_CFLAGS"
42+export CXXFLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 $TARGET_CFLAGS"
43 export MAKE_JFLAG=-j4
44
45 export MYSQL_RPMBUILD_TEST="$TEST"
46
47=== modified file 'utils/debian/control'
48--- utils/debian/control 2013-04-22 19:54:56 +0000
49+++ utils/debian/control 2013-05-07 04:38:29 +0000
50@@ -2,8 +2,8 @@
51 Section: misc
52 Priority: extra
53 Maintainer: Percona Development <mysql-dev@percona.com>
54-Build-Depends: debhelper (>= 7.3), autotools-dev, libaio-dev, wget, automake,
55- libtool, bison, libncurses-dev, libz-dev, cmake, bzr
56+Build-Depends: debhelper (>= 7.3), libaio-dev, wget, automake,
57+ libtool, bison, libncurses-dev, libz-dev, libssl-dev, cmake, bzr, ca-certificates
58 Standards-Version: 3.9.3
59 Homepage: https://launchpad.net/percona-xtrabackup
60 Vcs-Browser: http://bazaar.launchpad.net/~percona-dev/percona-xtrabackup/release-1.4/files
61
62=== modified file 'utils/xtrabackup.spec'
63--- utils/xtrabackup.spec 2013-04-04 05:23:53 +0000
64+++ utils/xtrabackup.spec 2013-05-07 04:38:29 +0000
65@@ -61,7 +61,7 @@
66 export CC=${CC-"gcc"}
67 export CXX=${CXX-"g++"}
68 export CFLAGS="$CFLAGS -DXTRABACKUP_VERSION=\\\"%{xtrabackup_version}\\\" -DXTRABACKUP_REVISION=\\\"%{xtrabackup_revision}\\\""
69-export CXXFLAGS="$CXXFLAGS -DXTRABACKUP_VERSION=\\\"%{xtrabackup_version}\\\" -DXTRABACKUP_REVISION=\\\"%{xtrabackup_revision}\\\" -fno-exceptions"
70+export CXXFLAGS="$CXXFLAGS -DXTRABACKUP_VERSION=\\\"%{xtrabackup_version}\\\" -DXTRABACKUP_REVISION=\\\"%{xtrabackup_revision}\\\""
71 AUTO_DOWNLOAD=yes ./utils/build.sh 5.1
72 cp src/xtrabackup_51 src/xbstream .
73 AUTO_DOWNLOAD=yes ./utils/build.sh xtradb

Subscribers

People subscribed via source and target branches