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

Proposed by Ignacio Nin
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
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) Approve
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.
Revision history for this message
Alexey Kopytov (akopytov) wrote :

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

review: Approve
Revision history for this message
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
=== modified file 'build/build-shared-compat-rpm.sh'
--- build/build-shared-compat-rpm.sh 2012-09-21 18:58:37 +0000
+++ build/build-shared-compat-rpm.sh 2012-10-29 17:37:22 +0000
@@ -101,6 +101,10 @@
101 "$SOURCEDIR/Makefile" | cut -d = -f 2)"101 "$SOURCEDIR/Makefile" | cut -d = -f 2)"
102PRODUCT="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"102PRODUCT="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
103103
104# Extract version of the 5.1 branch, to get .so.16 from there.
105MYSQL_VERSION51="$(grep '^%define version51 ' \
106 "$SOURCEDIR/build/percona-shared-compat.spec" | cut -d ' ' -f3)"
107
104# Build information108# Build information
105REDHAT_RELEASE="$(grep -o 'release [0-9][0-9]*' /etc/redhat-release | \109REDHAT_RELEASE="$(grep -o 'release [0-9][0-9]*' /etc/redhat-release | \
106 cut -d ' ' -f 2)"110 cut -d ' ' -f 2)"
@@ -131,7 +135,8 @@
131 RPMVER=i386135 RPMVER=i386
132 fi136 fi
133137
134 wget "http://www.percona.com/downloads/community/shared-compat/MySQL-shared-compat-$MYSQL_VERSION-1.linux2.6.$RPMVER.rpm"138 wget -c "http://www.percona.com/downloads/community/shared-compat/MySQL-shared-compat-$MYSQL_VERSION-1.linux2.6.$RPMVER.rpm"
139 wget -c "http://www.percona.com/downloads/community/shared-compat/Percona-Server-shared-51-$MYSQL_VERSION51.rhel$REDHAT_RELEASE.$RPMVER.rpm"
135140
136)141)
137142
138143
=== modified file 'build/debian/rules'
--- build/debian/rules 2012-10-05 20:43:57 +0000
+++ build/debian/rules 2012-10-29 17:37:22 +0000
@@ -9,7 +9,7 @@
99
10feature_set="community"10feature_set="community"
11major_version=2911major_version=29
12minor_version=012minor_version=1
13compilation_comment_release="Percona Server (GPL), Release $(major_version).$(minor_version)"13compilation_comment_release="Percona Server (GPL), Release $(major_version).$(minor_version)"
14server_suffix="-$(major_version).$(minor_version)"14server_suffix="-$(major_version).$(minor_version)"
15prefix="/usr"15prefix="/usr"
1616
=== modified file 'build/percona-server.spec'
--- build/percona-server.spec 2012-10-05 20:43:57 +0000
+++ build/percona-server.spec 2012-10-29 17:37:22 +0000
@@ -25,10 +25,10 @@
25%define mysql_vendor Oracle and/or its affiliates25%define mysql_vendor Oracle and/or its affiliates
26%define percona_server_vendor Percona, Inc26%define percona_server_vendor Percona, Inc
2727
28%define mysql_version 5.5.2728%define mysql_version 5.5.28
29%define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')29%define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
30%define majorversion 2930%define majorversion 29
31%define minorversion 031%define minorversion 1
32%define distribution rhel%{redhatversion}32%define distribution rhel%{redhatversion}
33%define percona_server_version rel%{majorversion}.%{minorversion}33%define percona_server_version rel%{majorversion}.%{minorversion}
3434
3535
=== modified file 'build/percona-shared-compat.spec'
--- build/percona-shared-compat.spec 2012-09-18 05:14:49 +0000
+++ build/percona-shared-compat.spec 2012-10-29 17:37:22 +0000
@@ -28,8 +28,8 @@
28#28#
29# Change this to match the version of the shared libs you want to include29# Change this to match the version of the shared libs you want to include
30#30#
31%define version55 5.5.2731%define version55 5.5.28
32%define version51 5.1.4832%define version51 5.1.66
33%define version50 5.0.9133%define version50 5.0.91
34%define version41 4.1.2234%define version41 4.1.22
35%define version40 4.0.2735%define version40 4.0.27
@@ -53,6 +53,7 @@
5353
54# We extract the older libraries from mysql-shared-compat and the newer from our sources54# We extract the older libraries from mysql-shared-compat and the newer from our sources
55Source0: MySQL-shared-compat-%{version55}-1.linux2.6.%{_arch}.rpm55Source0: MySQL-shared-compat-%{version55}-1.linux2.6.%{_arch}.rpm
56Source1: Percona-Server-shared-51-%{version51}.rhel%{redhatversion}.%{_arch}.rpm
56#Source1: MySQL-shared-%{version50}-1.%{_arch}.rpm57#Source1: MySQL-shared-%{version50}-1.%{_arch}.rpm
57#Source2: MySQL-shared-%{version41}-0.%{_arch}.rpm58#Source2: MySQL-shared-%{version41}-0.%{_arch}.rpm
58#Source3: MySQL-shared-%{version40}-0.%{_arch}.rpm59#Source3: MySQL-shared-%{version40}-0.%{_arch}.rpm
@@ -60,7 +61,7 @@
60# No need to include the RPMs once more - they can be downloaded seperately61# No need to include the RPMs once more - they can be downloaded seperately
61# if you want to rebuild this package62# if you want to rebuild this package
62NoSource: 063NoSource: 0
63#NoSource: 164NoSource: 1
64#NoSource: 265#NoSource: 2
65#NoSource: 366#NoSource: 3
66BuildRoot: %{_tmppath}/%{name}-%{version}-build67BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -80,6 +81,7 @@
80#rpm2cpio %{SOURCE1} | cpio -iv --make-directories81#rpm2cpio %{SOURCE1} | cpio -iv --make-directories
81#rpm2cpio %{SOURCE2} | cpio -iv --make-directories82#rpm2cpio %{SOURCE2} | cpio -iv --make-directories
82#rpm2cpio %{SOURCE3} | cpio -iv --make-directories83#rpm2cpio %{SOURCE3} | cpio -iv --make-directories
84rpm2cpio %{SOURCE1} | cpio -ivu '*/usr/lib64/libmysqlclient*so.16*'
83/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}85/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
8486
85%clean87%clean

Subscribers

People subscribed via source and target branches