Merge lp:~percona-core/percona-server/release-5.1.73-14.12 into lp:percona-server/5.1

Proposed by Tomislav Plavcic on 2014-08-01
Status: Merged
Approved by: Laurynas Biveinis on 2014-08-01
Approved revision: 624
Merged at revision: 623
Proposed branch: lp:~percona-core/percona-server/release-5.1.73-14.12
Merge into: lp:percona-server/5.1
Diff against target: 207 lines (+31/-15)
10 files modified
Makefile (+1/-1)
Percona-Server/storage/innodb_plugin/include/univ.i (+1/-1)
build/build-binary.sh (+1/-0)
build/build-shared-compat-rpm.sh (+1/-1)
build/debian/changelog (+12/-0)
build/debian/control (+3/-3)
build/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch (+1/-1)
build/debian/rules (+3/-1)
build/percona-server.spec (+6/-5)
build/percona-shared-compat.spec (+2/-2)
To merge this branch: bzr merge lp:~percona-core/percona-server/release-5.1.73-14.12
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2014-08-01 Approve on 2014-08-01
Review via email: mp+229185@code.launchpad.net

Description of the change

Release branch for version 5.1.73-14.12

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile'
--- Makefile 2014-03-12 22:02:31 +0000
+++ Makefile 2014-08-01 09:50:45 +0000
@@ -1,5 +1,5 @@
1MYSQL_VERSION=5.1.731MYSQL_VERSION=5.1.73
2PERCONA_SERVER_VERSION=rel14.102PERCONA_SERVER_VERSION=rel14.12
3PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)3PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
4PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)4PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
5PERCONA_SERVER_SHORT_2 ?=Percona-Server5PERCONA_SERVER_SHORT_2 ?=Percona-Server
66
=== modified file 'Percona-Server/storage/innodb_plugin/include/univ.i'
--- Percona-Server/storage/innodb_plugin/include/univ.i 2013-08-05 13:11:52 +0000
+++ Percona-Server/storage/innodb_plugin/include/univ.i 2014-08-01 09:50:45 +0000
@@ -51,7 +51,7 @@
51#define INNODB_VERSION_MINOR (MYSQL_VERSION_ID / 100 % 100)51#define INNODB_VERSION_MINOR (MYSQL_VERSION_ID / 100 % 100)
5252
53#ifndef PERCONA_INNODB_VERSION53#ifndef PERCONA_INNODB_VERSION
54#define PERCONA_INNODB_VERSION 14.654#define PERCONA_INNODB_VERSION 14.12
55#endif55#endif
5656
5757
5858
=== modified file 'build/build-binary.sh'
--- build/build-binary.sh 2014-07-31 06:26:57 +0000
+++ build/build-binary.sh 2014-08-01 09:50:45 +0000
@@ -148,6 +148,7 @@
148 ./configure \148 ./configure \
149 --prefix="/usr/local/$PRODUCT_FULL" \149 --prefix="/usr/local/$PRODUCT_FULL" \
150 --localstatedir="/usr/local/$PRODUCT_FULL/data" \150 --localstatedir="/usr/local/$PRODUCT_FULL/data" \
151 --with-server-suffix="-${PERCONA_SERVER_VERSION#rel}" \
151 --with-plugins=partition,archive,blackhole,csv,example,federated,innodb_plugin \152 --with-plugins=partition,archive,blackhole,csv,example,federated,innodb_plugin \
152 --without-embedded-server \153 --without-embedded-server \
153 --with-comment="$COMMENT" \154 --with-comment="$COMMENT" \
154155
=== modified file 'build/build-shared-compat-rpm.sh'
--- build/build-shared-compat-rpm.sh 2013-03-06 10:46:45 +0000
+++ build/build-shared-compat-rpm.sh 2014-08-01 09:50:45 +0000
@@ -131,7 +131,7 @@
131 RPMVER=i386131 RPMVER=i386
132 fi132 fi
133133
134 wget "http://www.percona.com/downloads/community/shared-compat/MySQL-shared-compat-$MYSQL_VERSION-1.glibc23.$RPMVER.rpm"134 wget "http://www.percona.com/downloads/community/shared-compat/MySQL-shared-compat-$MYSQL_VERSION-1.rhel5.$RPMVER.rpm"
135135
136)136)
137137
138138
=== modified file 'build/debian/changelog'
--- build/debian/changelog 2013-09-25 16:32:27 +0000
+++ build/debian/changelog 2014-08-01 09:50:45 +0000
@@ -1,3 +1,15 @@
1percona-server-5.1 (5.1.73-rel14.12) unstable; urgency=low
2
3 * Percona Server 5.1 release 14.12
4
5 -- Tomislav Plavcic <tomislav.plavcic@percona.com> Mon, 16 Jun 2014 10:51:12 +0200
6
7percona-server-5.1 (5.1.73-rel14.11) unstable; urgency=low
8
9 * Percona Server 5.1 release 14.11
10
11 -- Alexey Bychko <alexey.bychko@percona.com> Thu, 19 Dec 2013 12:30:00 +0700
12
1percona-server-5.1 (5.1.72-rel14.10) unstable; urgency=low13percona-server-5.1 (5.1.72-rel14.10) unstable; urgency=low
214
3 * Added --error-handler=: to dh_installinit in order to15 * Added --error-handler=: to dh_installinit in order to
416
=== modified file 'build/debian/control'
--- build/debian/control 2013-05-23 09:10:47 +0000
+++ build/debian/control 2014-08-01 09:50:45 +0000
@@ -2,7 +2,7 @@
2Section: misc2Section: misc
3Priority: optional3Priority: optional
4Maintainer: Percona Server Development Team <mysql-dev@percona.com>4Maintainer: Percona Server Development Team <mysql-dev@percona.com>
5Uploaders: Ignacio Nin <ignacio.nin@percona.com>5Uploaders: Alexey Bychko <alexey.bychko@percona.com>
6Build-Depends: libtool (>= 1.4.2-7), procps | hurd, debhelper (>= 7.0.50), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), po-debconf, chrpath, automake (>= 1.9), dpatch, gawk, bison, lsb-release, fakeroot, libssl-dev6Build-Depends: libtool (>= 1.4.2-7), procps | hurd, debhelper (>= 7.0.50), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), po-debconf, chrpath, automake (>= 1.9), dpatch, gawk, bison, lsb-release, fakeroot, libssl-dev
7Standards-Version: 7.0.07Standards-Version: 7.0.0
8Homepage: http://www.percona.com/software/8Homepage: http://www.percona.com/software/
@@ -39,11 +39,11 @@
3939
40Package: percona-server-common40Package: percona-server-common
41Section: database41Section: database
42Architecture: any
43Depends: ${shlibs:Depends}, ${misc:Depends}
44Conflicts: mysql-common-4.1, mysql-common-5.0, mysql-common-5.1, mysql-common42Conflicts: mysql-common-4.1, mysql-common-5.0, mysql-common-5.1, mysql-common
45Provides: mysql-common43Provides: mysql-common
46Replaces: mysql-common-4.1, mysql-common-5.0, mysql-common-5.1, mysql-common44Replaces: mysql-common-4.1, mysql-common-5.0, mysql-common-5.1, mysql-common
45Architecture: any
46Depends: ${shlibs:Depends}, ${misc:Depends}
47Description: Percona Server database common files (e.g. /etc/mysql/my.cnf)47Description: Percona Server database common files (e.g. /etc/mysql/my.cnf)
48 Percona Server is a fast, stable and true multi-user, multi-threaded SQL database48 Percona Server is a fast, stable and true multi-user, multi-threaded SQL database
49 server. SQL (Structured Query Language) is the most popular database query49 server. SQL (Structured Query Language) is the most popular database query
5050
=== modified file 'build/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch'
--- build/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch 2010-05-31 13:57:21 +0000
+++ build/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch 2014-08-01 09:50:45 +0000
@@ -24,6 +24,6 @@
24 REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0 FROM dual WHERE LOWER( @current_hostname) != 'localhost';24 REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0 FROM dual WHERE LOWER( @current_hostname) != 'localhost';
25 REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);25 REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
26-INSERT INTO tmp_user (host,user) VALUES ('localhost','');26-INSERT INTO tmp_user (host,user) VALUES ('localhost','');
27-INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE LOWER(@current_hostname ) != 'localhost';27-INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE @current_hostname != 'localhost';
28 INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;28 INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;
29 DROP TABLE tmp_user;29 DROP TABLE tmp_user;
3030
=== modified file 'build/debian/rules'
--- build/debian/rules 2014-05-28 07:18:00 +0000
+++ build/debian/rules 2014-08-01 09:50:45 +0000
@@ -9,12 +9,13 @@
9TMP=$(CURDIR)/debian/tmp/9TMP=$(CURDIR)/debian/tmp/
1010
11major_version_default=1411major_version_default=14
12minor_version_default=912minor_version_default=12
1313
14ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)14ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
15ARCH_OS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)15ARCH_OS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
16DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)16DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
17DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)17DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
18DEBVERSION = $(shell echo "`if test -z \"$(major_version)\"; then echo ${major_version_default}; else echo $(major_version); fi`.`if test -z \"$(minor_version)\"; then echo ${minor_version_default}; else echo $(minor_version); fi`" )
1819
19DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))20DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
20DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')21DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
@@ -87,6 +88,7 @@
87 --infodir=/usr/share/info \88 --infodir=/usr/share/info \
88 --mandir=/usr/share/man \89 --mandir=/usr/share/man \
89 \90 \
91 --with-server-suffix="-$(DEBVERSION)" \
90 --with-comment="$(DISTRIBUTION)" \92 --with-comment="$(DISTRIBUTION)" \
91 --with-system-type="debian-linux-gnu" \93 --with-system-type="debian-linux-gnu" \
92 \94 \
9395
=== modified file 'build/percona-server.spec'
--- build/percona-server.spec 2014-05-28 07:18:00 +0000
+++ build/percona-server.spec 2014-08-01 09:50:45 +0000
@@ -14,9 +14,9 @@
14%define mysql_vendor Percona, Inc14%define mysql_vendor Percona, Inc
15%define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')15%define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
16%define community 116%define community 1
17%define mysqlversion 5.1.7117%define mysqlversion 5.1.73
18%define majorversion 1418%define majorversion 14
19%define minorversion 919%define minorversion 12
20%define distribution rhel%{redhatversion}20%define distribution rhel%{redhatversion}
21%define release rel%{majorversion}.%{minorversion}.%{gotrevision}.%{distribution}21%define release rel%{majorversion}.%{minorversion}.%{gotrevision}.%{distribution}
2222
@@ -104,7 +104,7 @@
104104
105%define __os_install_post /usr/lib/rpm/brp-compress105%define __os_install_post /usr/lib/rpm/brp-compress
106106
107%define server_suffix -rel%{majorversion}.%{minorversion}107%define server_suffix -%{majorversion}.%{minorversion}
108%define package_suffix -51108%define package_suffix -51
109%define ndbug_comment Percona Server (GPL), Release %{majorversion}.%{minorversion}, Revision %{gotrevision}109%define ndbug_comment Percona Server (GPL), Release %{majorversion}.%{minorversion}, Revision %{gotrevision}
110%define debug_comment Percona Server - Debug (GPL), Release %{majorversion}.%{minorversion}, Revision %{gotrevision}110%define debug_comment Percona Server - Debug (GPL), Release %{majorversion}.%{minorversion}, Revision %{gotrevision}
@@ -115,7 +115,7 @@
115115
116%define lic_type GNU GPL v2116%define lic_type GNU GPL v2
117%define lic_files COPYING README117%define lic_files COPYING README
118%define src_dir Percona-Server-%{mysqlversion}%{server_suffix}118%define src_dir Percona-Server-%{mysqlversion}-rel%{majorversion}.%{minorversion}
119119
120##############################################################################120##############################################################################
121# Main spec file section121# Main spec file section
@@ -128,7 +128,7 @@
128Release: %{release}128Release: %{release}
129Distribution: Red Hat Enterprise Linux %{redhatversion}129Distribution: Red Hat Enterprise Linux %{redhatversion}
130License: GPL version 2 http://www.gnu.org/licenses/gpl-2.0.html130License: GPL version 2 http://www.gnu.org/licenses/gpl-2.0.html
131Source: Percona-Server-%{mysqlversion}%{server_suffix}.tar.gz131Source: %{src_dir}.tar.gz
132URL: http://www.percona.com/132URL: http://www.percona.com/
133Packager: %{mysql_vendor} Development Team <mysql-dev@percona.com>133Packager: %{mysql_vendor} Development Team <mysql-dev@percona.com>
134Vendor: %{mysql_vendor}134Vendor: %{mysql_vendor}
@@ -337,6 +337,7 @@
337337
338BuildServer() {338BuildServer() {
339BuildMySQL "--enable-shared \339BuildMySQL "--enable-shared \
340 --with-server-suffix='%{server_suffix}' \
340 --without-embedded-server \341 --without-embedded-server \
341 --without-bench \342 --without-bench \
342 --with-zlib-dir=bundled \343 --with-zlib-dir=bundled \
343344
=== modified file 'build/percona-shared-compat.spec'
--- build/percona-shared-compat.spec 2013-08-27 15:05:45 +0000
+++ build/percona-shared-compat.spec 2014-08-01 09:50:45 +0000
@@ -28,7 +28,7 @@
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 version51 5.1.7131%define version51 5.1.73
32%define version50 5.0.9132%define version50 5.0.91
33%define version41 4.1.2233%define version41 4.1.22
34%define version40 4.0.2734%define version40 4.0.27
@@ -51,7 +51,7 @@
51Summary: MySQL shared client libraries for MySQL %{version55}, %{version50}, %{version41} and %{version40}51Summary: MySQL shared client libraries for MySQL %{version55}, %{version50}, %{version41} and %{version40}
5252
53# We extract the older libraries from mysql-shared-compat and the newer from our sources53# We extract the older libraries from mysql-shared-compat and the newer from our sources
54Source0: MySQL-shared-compat-%{version51}-1.glibc23.%{_arch}.rpm54Source0: MySQL-shared-compat-%{version51}-1.rhel5.%{_arch}.rpm
55#Source1: MySQL-shared-%{version50}-1.%{_arch}.rpm55#Source1: MySQL-shared-%{version50}-1.%{_arch}.rpm
56#Source2: MySQL-shared-%{version41}-0.%{_arch}.rpm56#Source2: MySQL-shared-%{version41}-0.%{_arch}.rpm
57#Source3: MySQL-shared-%{version40}-0.%{_arch}.rpm57#Source3: MySQL-shared-%{version40}-0.%{_arch}.rpm

Subscribers

People subscribed via source and target branches