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

[Ignacio Nin]

Changes from 5.5.28-29.1

[Alexey Kopytov (akopytov)]

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

review: Approve

[Ignacio Nin (ignacio-nin)]

> 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.

=== 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 @@
     "$SOURCEDIR/Makefile" | cut -d = -f 2)"
 PRODUCT="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
 
+# Extract version of the 5.1 branch, to get .so.16 from there.
+MYSQL_VERSION51="$(grep '^%define version51 ' \
+    "$SOURCEDIR/build/percona-shared-compat.spec" | cut -d ' ' -f3)"
+
 # Build information
 REDHAT_RELEASE="$(grep -o 'release [0-9][0-9]*' /etc/redhat-release | \
     cut -d ' ' -f 2)"
@@ -131,7 +135,8 @@
         RPMVER=i386
     fi
 
-    wget "http://www.percona.com/downloads/community/shared-compat/MySQL-shared-compat-$MYSQL_VERSION-1.linux2.6.$RPMVER.rpm"
+    wget -c "http://www.percona.com/downloads/community/shared-compat/MySQL-shared-compat-$MYSQL_VERSION-1.linux2.6.$RPMVER.rpm"
+    wget -c "http://www.percona.com/downloads/community/shared-compat/Percona-Server-shared-51-$MYSQL_VERSION51.rhel$REDHAT_RELEASE.$RPMVER.rpm"
 
 )
 

=== 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 @@
 
 feature_set="community"
 major_version=29
-minor_version=0
+minor_version=1
 compilation_comment_release="Percona Server (GPL), Release $(major_version).$(minor_version)"
 server_suffix="-$(major_version).$(minor_version)"
 prefix="/usr"

=== 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 @@
 %define mysql_vendor            Oracle and/or its affiliates
 %define percona_server_vendor	Percona, Inc
 
-%define mysql_version   5.5.27
+%define mysql_version   5.5.28
 %define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
 %define majorversion 29
-%define minorversion 0
+%define minorversion 1
 %define distribution  rhel%{redhatversion}
 %define percona_server_version	rel%{majorversion}.%{minorversion}
 

=== 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 @@
 #
 # Change this to match the version of the shared libs you want to include
 #
-%define version55 5.5.27
-%define version51 5.1.48
+%define version55 5.5.28
+%define version51 5.1.66
 %define version50 5.0.91
 %define version41 4.1.22
 %define version40 4.0.27
@@ -53,6 +53,7 @@
 
 # We extract the older libraries from mysql-shared-compat and the newer from our sources
 Source0:      MySQL-shared-compat-%{version55}-1.linux2.6.%{_arch}.rpm
+Source1:      Percona-Server-shared-51-%{version51}.rhel%{redhatversion}.%{_arch}.rpm
 #Source1:      MySQL-shared-%{version50}-1.%{_arch}.rpm
 #Source2:      MySQL-shared-%{version41}-0.%{_arch}.rpm
 #Source3:      MySQL-shared-%{version40}-0.%{_arch}.rpm
@@ -60,7 +61,7 @@
 # No need to include the RPMs once more - they can be downloaded seperately
 # if you want to rebuild this package
 NoSource:     0
-#NoSource:     1
+NoSource:     1
 #NoSource:     2
 #NoSource:     3
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -80,6 +81,7 @@
 #rpm2cpio %{SOURCE1} | cpio -iv --make-directories
 #rpm2cpio %{SOURCE2} | cpio -iv --make-directories
 #rpm2cpio %{SOURCE3} | cpio -iv --make-directories
+rpm2cpio %{SOURCE1} | cpio -ivu '*/usr/lib64/libmysqlclient*so.16*'
 /sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
 
 %clean