Merge lp:~percona-core/percona-server/release-5.5.28-29.1 into lp:percona-server/5.5

Proposed by Ignacio Nin on 2012-10-29
Status: Merged
Approved by: Alexey Kopytov on 2012-10-30
Approved revision: 335
Merged at revision: 351
Proposed branch: lp:~percona-core/percona-server/release-5.5.28-29.1
Merge into: lp:percona-server/5.5
Diff against target: 94 lines (+14/-7)
4 files modified
build/build-shared-compat-rpm.sh (+6/-1)
build/debian/rules (+1/-1)
build/percona-server.spec (+2/-2)
build/percona-shared-compat.spec (+5/-3)
To merge this branch: bzr merge lp:~percona-core/percona-server/release-5.5.28-29.1
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2012-10-29 Approve on 2012-10-30
Review via email: mp+131960@code.launchpad.net

Description of the change

Changes from 5.5.28-29.1

To post a comment you must log in.
Alexey Kopytov (akopytov) wrote :

Should we target the bug to the already releaded 5.5.28-29.1?

review: Approve
Ignacio Nin (ignacio-nin) wrote :

> Should we target the bug to the already releaded 5.5.28-29.1?

My testing would indicate that it's been fixed now, in addition to another user (verwilst). I think it's safe for now to say it's been fix-released, yes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'build/build-shared-compat-rpm.sh'
2--- build/build-shared-compat-rpm.sh 2012-09-21 18:58:37 +0000
3+++ build/build-shared-compat-rpm.sh 2012-10-29 17:37:22 +0000
4@@ -101,6 +101,10 @@
5 "$SOURCEDIR/Makefile" | cut -d = -f 2)"
6 PRODUCT="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
7
8+# Extract version of the 5.1 branch, to get .so.16 from there.
9+MYSQL_VERSION51="$(grep '^%define version51 ' \
10+ "$SOURCEDIR/build/percona-shared-compat.spec" | cut -d ' ' -f3)"
11+
12 # Build information
13 REDHAT_RELEASE="$(grep -o 'release [0-9][0-9]*' /etc/redhat-release | \
14 cut -d ' ' -f 2)"
15@@ -131,7 +135,8 @@
16 RPMVER=i386
17 fi
18
19- wget "http://www.percona.com/downloads/community/shared-compat/MySQL-shared-compat-$MYSQL_VERSION-1.linux2.6.$RPMVER.rpm"
20+ wget -c "http://www.percona.com/downloads/community/shared-compat/MySQL-shared-compat-$MYSQL_VERSION-1.linux2.6.$RPMVER.rpm"
21+ wget -c "http://www.percona.com/downloads/community/shared-compat/Percona-Server-shared-51-$MYSQL_VERSION51.rhel$REDHAT_RELEASE.$RPMVER.rpm"
22
23 )
24
25
26=== modified file 'build/debian/rules'
27--- build/debian/rules 2012-10-05 20:43:57 +0000
28+++ build/debian/rules 2012-10-29 17:37:22 +0000
29@@ -9,7 +9,7 @@
30
31 feature_set="community"
32 major_version=29
33-minor_version=0
34+minor_version=1
35 compilation_comment_release="Percona Server (GPL), Release $(major_version).$(minor_version)"
36 server_suffix="-$(major_version).$(minor_version)"
37 prefix="/usr"
38
39=== modified file 'build/percona-server.spec'
40--- build/percona-server.spec 2012-10-05 20:43:57 +0000
41+++ build/percona-server.spec 2012-10-29 17:37:22 +0000
42@@ -25,10 +25,10 @@
43 %define mysql_vendor Oracle and/or its affiliates
44 %define percona_server_vendor Percona, Inc
45
46-%define mysql_version 5.5.27
47+%define mysql_version 5.5.28
48 %define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
49 %define majorversion 29
50-%define minorversion 0
51+%define minorversion 1
52 %define distribution rhel%{redhatversion}
53 %define percona_server_version rel%{majorversion}.%{minorversion}
54
55
56=== modified file 'build/percona-shared-compat.spec'
57--- build/percona-shared-compat.spec 2012-09-18 05:14:49 +0000
58+++ build/percona-shared-compat.spec 2012-10-29 17:37:22 +0000
59@@ -28,8 +28,8 @@
60 #
61 # Change this to match the version of the shared libs you want to include
62 #
63-%define version55 5.5.27
64-%define version51 5.1.48
65+%define version55 5.5.28
66+%define version51 5.1.66
67 %define version50 5.0.91
68 %define version41 4.1.22
69 %define version40 4.0.27
70@@ -53,6 +53,7 @@
71
72 # We extract the older libraries from mysql-shared-compat and the newer from our sources
73 Source0: MySQL-shared-compat-%{version55}-1.linux2.6.%{_arch}.rpm
74+Source1: Percona-Server-shared-51-%{version51}.rhel%{redhatversion}.%{_arch}.rpm
75 #Source1: MySQL-shared-%{version50}-1.%{_arch}.rpm
76 #Source2: MySQL-shared-%{version41}-0.%{_arch}.rpm
77 #Source3: MySQL-shared-%{version40}-0.%{_arch}.rpm
78@@ -60,7 +61,7 @@
79 # No need to include the RPMs once more - they can be downloaded seperately
80 # if you want to rebuild this package
81 NoSource: 0
82-#NoSource: 1
83+NoSource: 1
84 #NoSource: 2
85 #NoSource: 3
86 BuildRoot: %{_tmppath}/%{name}-%{version}-build
87@@ -80,6 +81,7 @@
88 #rpm2cpio %{SOURCE1} | cpio -iv --make-directories
89 #rpm2cpio %{SOURCE2} | cpio -iv --make-directories
90 #rpm2cpio %{SOURCE3} | cpio -iv --make-directories
91+rpm2cpio %{SOURCE1} | cpio -ivu '*/usr/lib64/libmysqlclient*so.16*'
92 /sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
93
94 %clean

Subscribers

People subscribed via source and target branches