Percona Server with XtraDB

Merge lp:~percona-core/percona-server/release-5.5.20-24.1 into lp:percona-server/5.5

Proposed by Ignacio Nin on 2012-02-12
Status: Merged
Approved by: Stewart Smith on 2012-02-22
Approved revision: 217
Merged at revision: 216
Proposed branch: lp:~percona-core/percona-server/release-5.5.20-24.1
Merge into: lp:percona-server/5.5
Diff against target: 128 lines (+25/-14) 5 files modified
To merge this branch: bzr merge lp:~percona-core/percona-server/release-5.5.20-24.1
Reviewer Review Type Date Requested Status
Stewart Smith (community) 2012-02-12 Approve on 2012-02-22
Review via email: mp+92647@code.launchpad.net

Description of the Change

Changes for release-5.5.20-24.1

To post a comment you must log in.
Stewart Smith (stewart) :
review: Approve

Preview Diff

1=== modified file 'build/build-shared-compat-rpm.sh'
2--- build/build-shared-compat-rpm.sh 2011-04-21 20:56:48 +0000
3+++ build/build-shared-compat-rpm.sh 2012-02-12 00:22:17 +0000
4@@ -60,8 +60,6 @@
5 exit 1
6 fi
7
8- WORKDIR_ABS="$(cd "$WORKDIR"; pwd)"
9-
10 elif test "$#" -eq 1
11 then
12 WORKDIR="$1"
13@@ -73,14 +71,26 @@
14 exit 1
15 fi
16
17- WORKDIR_ABS="$(cd "$WORKDIR"; pwd)"
18-
19 else
20 echo >&2 "Usage: $0 [target dir]"
21 exit 1
22
23 fi
24
25+WORKDIR_ABS="$(cd "$WORKDIR"; pwd)"
26+
27+# If we're in 32 bits, ensure that we're compiling for i686.
28+if test "x$TARGET" == "x"
29+then
30+ if test "x$(uname -m)" != "xx86_64"
31+ then
32+ TARGET='i686'
33+ TARGET_ARG="--target i686"
34+ TARGET_CFLAGS='-m32 -march=i686'
35+ fi
36+
37+fi
38+
39 SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
40 test -e "$SOURCEDIR/Makefile" || exit 2
41
42
43=== modified file 'build/debian/libmysqlclient-dev.links'
44--- build/debian/libmysqlclient-dev.links 2011-03-19 08:50:37 +0000
45+++ build/debian/libmysqlclient-dev.links 2012-02-12 00:22:17 +0000
46@@ -1,2 +1,2 @@
47-usr/lib/libmysqlclient.so.16 usr/lib/libmysqlclient.so
48-usr/lib/libmysqlclient_r.so.16 usr/lib/libmysqlclient_r.so
49+usr/lib/libmysqlclient.so.18 usr/lib/libmysqlclient.so
50+usr/lib/libmysqlclient_r.so.18 usr/lib/libmysqlclient_r.so
51
52=== modified file 'build/debian/rules'
53--- build/debian/rules 2012-01-11 17:15:39 +0000
54+++ build/debian/rules 2012-02-12 00:22:17 +0000
55@@ -8,7 +8,7 @@
56 TMP=$(CURDIR)/debian/tmp/
57
58 feature_set="community"
59-compilation_comment_release="Percona Server (GPL), Release 24.0"
60+compilation_comment_release="Percona Server (GPL), Release 24.1"
61 server_suffix="-55"
62 prefix="/usr"
63
64@@ -19,7 +19,7 @@
65 rm -rf CMakeFiles
66
67 build: patch
68- echo "Building Percona Server 24.0"
69+ echo "Building Percona Server 24.1"
70 dh_testdir
71 $(CMAKE) . -DBUILD_CONFIG=mysql_release \
72 -DINSTALL_LAYOUT=DEB \
73
74=== modified file 'build/percona-server.spec'
75--- build/percona-server.spec 2012-01-11 17:15:39 +0000
76+++ build/percona-server.spec 2012-02-12 00:22:17 +0000
77@@ -25,10 +25,10 @@
78 %define mysql_vendor Oracle and/or its affiliates
79 %define percona_server_vendor Percona, Inc
80
81-%define mysql_version 5.5.19
82+%define mysql_version 5.5.20
83 %define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
84 %define majorversion 24
85-%define minorversion 0
86+%define minorversion 1
87 %define distribution rhel%{redhatversion}
88 %define percona_server_version rel%{majorversion}.%{minorversion}
89
90@@ -328,13 +328,14 @@
91 %build
92
93 # Be strict about variables, bail at earliest opportunity, etc.
94-set -u
95+set -uex
96+
97 BuildHandlerSocket() {
98 cd storage/HandlerSocket-Plugin-for-MySQL
99 bash -x ./autogen.sh
100 echo "Configuring HandlerSocket"
101 CXX="${HS_CXX:-g++}" \
102- CXXFLAGS="$CXXFLAGS -I$RPM_BUILD_DIR/%{src_dir}/release/include" \
103+ MYSQL_CFLAGS="-I $RPM_BUILD_DIR/%{src_dir}/release/include" \
104 ./configure --with-mysql-source=$RPM_BUILD_DIR/%{src_dir}/%{src_dir} \
105 --with-mysql-bindir=$RPM_BUILD_DIR/%{src_dir}/release/scripts \
106 --with-mysql-plugindir=%{_libdir}/mysql/plugin \
107@@ -442,7 +443,7 @@
108 do
109 for d in debug release
110 do
111- ln -s "../../../%{src_dir}/storage/innobase/$f" "$d/storage/innobase/"
112+ ln -s "../../../%{src_dir}/storage/innobase/pars/$f" "$d/storage/innobase/"
113 done
114 done
115
116
117=== modified file 'build/percona-shared-compat.spec'
118--- build/percona-shared-compat.spec 2012-01-11 17:15:39 +0000
119+++ build/percona-shared-compat.spec 2012-02-12 00:22:17 +0000
120@@ -28,7 +28,7 @@
121 #
122 # Change this to match the version of the shared libs you want to include
123 #
124-%define version55 5.5.19
125+%define version55 5.5.20
126 %define version51 5.1.48
127 %define version50 5.0.91
128 %define version41 4.1.22

Subscribers

People subscribed via source and target branches