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
1=== modified file 'Makefile'
2--- Makefile 2014-03-12 22:02:31 +0000
3+++ Makefile 2014-08-01 09:50:45 +0000
4@@ -1,5 +1,5 @@
5 MYSQL_VERSION=5.1.73
6-PERCONA_SERVER_VERSION=rel14.10
7+PERCONA_SERVER_VERSION=rel14.12
8 PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
9 PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
10 PERCONA_SERVER_SHORT_2 ?=Percona-Server
11
12=== modified file 'Percona-Server/storage/innodb_plugin/include/univ.i'
13--- Percona-Server/storage/innodb_plugin/include/univ.i 2013-08-05 13:11:52 +0000
14+++ Percona-Server/storage/innodb_plugin/include/univ.i 2014-08-01 09:50:45 +0000
15@@ -51,7 +51,7 @@
16 #define INNODB_VERSION_MINOR (MYSQL_VERSION_ID / 100 % 100)
17
18 #ifndef PERCONA_INNODB_VERSION
19-#define PERCONA_INNODB_VERSION 14.6
20+#define PERCONA_INNODB_VERSION 14.12
21 #endif
22
23
24
25=== modified file 'build/build-binary.sh'
26--- build/build-binary.sh 2014-07-31 06:26:57 +0000
27+++ build/build-binary.sh 2014-08-01 09:50:45 +0000
28@@ -148,6 +148,7 @@
29 ./configure \
30 --prefix="/usr/local/$PRODUCT_FULL" \
31 --localstatedir="/usr/local/$PRODUCT_FULL/data" \
32+ --with-server-suffix="-${PERCONA_SERVER_VERSION#rel}" \
33 --with-plugins=partition,archive,blackhole,csv,example,federated,innodb_plugin \
34 --without-embedded-server \
35 --with-comment="$COMMENT" \
36
37=== modified file 'build/build-shared-compat-rpm.sh'
38--- build/build-shared-compat-rpm.sh 2013-03-06 10:46:45 +0000
39+++ build/build-shared-compat-rpm.sh 2014-08-01 09:50:45 +0000
40@@ -131,7 +131,7 @@
41 RPMVER=i386
42 fi
43
44- wget "http://www.percona.com/downloads/community/shared-compat/MySQL-shared-compat-$MYSQL_VERSION-1.glibc23.$RPMVER.rpm"
45+ wget "http://www.percona.com/downloads/community/shared-compat/MySQL-shared-compat-$MYSQL_VERSION-1.rhel5.$RPMVER.rpm"
46
47 )
48
49
50=== modified file 'build/debian/changelog'
51--- build/debian/changelog 2013-09-25 16:32:27 +0000
52+++ build/debian/changelog 2014-08-01 09:50:45 +0000
53@@ -1,3 +1,15 @@
54+percona-server-5.1 (5.1.73-rel14.12) unstable; urgency=low
55+
56+ * Percona Server 5.1 release 14.12
57+
58+ -- Tomislav Plavcic <tomislav.plavcic@percona.com> Mon, 16 Jun 2014 10:51:12 +0200
59+
60+percona-server-5.1 (5.1.73-rel14.11) unstable; urgency=low
61+
62+ * Percona Server 5.1 release 14.11
63+
64+ -- Alexey Bychko <alexey.bychko@percona.com> Thu, 19 Dec 2013 12:30:00 +0700
65+
66 percona-server-5.1 (5.1.72-rel14.10) unstable; urgency=low
67
68 * Added --error-handler=: to dh_installinit in order to
69
70=== modified file 'build/debian/control'
71--- build/debian/control 2013-05-23 09:10:47 +0000
72+++ build/debian/control 2014-08-01 09:50:45 +0000
73@@ -2,7 +2,7 @@
74 Section: misc
75 Priority: optional
76 Maintainer: Percona Server Development Team <mysql-dev@percona.com>
77-Uploaders: Ignacio Nin <ignacio.nin@percona.com>
78+Uploaders: Alexey Bychko <alexey.bychko@percona.com>
79 Build-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
80 Standards-Version: 7.0.0
81 Homepage: http://www.percona.com/software/
82@@ -39,11 +39,11 @@
83
84 Package: percona-server-common
85 Section: database
86-Architecture: any
87-Depends: ${shlibs:Depends}, ${misc:Depends}
88 Conflicts: mysql-common-4.1, mysql-common-5.0, mysql-common-5.1, mysql-common
89 Provides: mysql-common
90 Replaces: mysql-common-4.1, mysql-common-5.0, mysql-common-5.1, mysql-common
91+Architecture: any
92+Depends: ${shlibs:Depends}, ${misc:Depends}
93 Description: Percona Server database common files (e.g. /etc/mysql/my.cnf)
94 Percona Server is a fast, stable and true multi-user, multi-threaded SQL database
95 server. SQL (Structured Query Language) is the most popular database query
96
97=== modified file 'build/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch'
98--- build/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch 2010-05-31 13:57:21 +0000
99+++ build/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch 2014-08-01 09:50:45 +0000
100@@ -24,6 +24,6 @@
101 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';
102 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);
103 -INSERT INTO tmp_user (host,user) VALUES ('localhost','');
104--INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE LOWER(@current_hostname ) != 'localhost';
105+-INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE @current_hostname != 'localhost';
106 INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;
107 DROP TABLE tmp_user;
108
109=== modified file 'build/debian/rules'
110--- build/debian/rules 2014-05-28 07:18:00 +0000
111+++ build/debian/rules 2014-08-01 09:50:45 +0000
112@@ -9,12 +9,13 @@
113 TMP=$(CURDIR)/debian/tmp/
114
115 major_version_default=14
116-minor_version_default=9
117+minor_version_default=12
118
119 ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
120 ARCH_OS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
121 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
122 DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
123+DEBVERSION = $(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`" )
124
125 DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
126 DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
127@@ -87,6 +88,7 @@
128 --infodir=/usr/share/info \
129 --mandir=/usr/share/man \
130 \
131+ --with-server-suffix="-$(DEBVERSION)" \
132 --with-comment="$(DISTRIBUTION)" \
133 --with-system-type="debian-linux-gnu" \
134 \
135
136=== modified file 'build/percona-server.spec'
137--- build/percona-server.spec 2014-05-28 07:18:00 +0000
138+++ build/percona-server.spec 2014-08-01 09:50:45 +0000
139@@ -14,9 +14,9 @@
140 %define mysql_vendor Percona, Inc
141 %define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
142 %define community 1
143-%define mysqlversion 5.1.71
144+%define mysqlversion 5.1.73
145 %define majorversion 14
146-%define minorversion 9
147+%define minorversion 12
148 %define distribution rhel%{redhatversion}
149 %define release rel%{majorversion}.%{minorversion}.%{gotrevision}.%{distribution}
150
151@@ -104,7 +104,7 @@
152
153 %define __os_install_post /usr/lib/rpm/brp-compress
154
155-%define server_suffix -rel%{majorversion}.%{minorversion}
156+%define server_suffix -%{majorversion}.%{minorversion}
157 %define package_suffix -51
158 %define ndbug_comment Percona Server (GPL), Release %{majorversion}.%{minorversion}, Revision %{gotrevision}
159 %define debug_comment Percona Server - Debug (GPL), Release %{majorversion}.%{minorversion}, Revision %{gotrevision}
160@@ -115,7 +115,7 @@
161
162 %define lic_type GNU GPL v2
163 %define lic_files COPYING README
164-%define src_dir Percona-Server-%{mysqlversion}%{server_suffix}
165+%define src_dir Percona-Server-%{mysqlversion}-rel%{majorversion}.%{minorversion}
166
167 ##############################################################################
168 # Main spec file section
169@@ -128,7 +128,7 @@
170 Release: %{release}
171 Distribution: Red Hat Enterprise Linux %{redhatversion}
172 License: GPL version 2 http://www.gnu.org/licenses/gpl-2.0.html
173-Source: Percona-Server-%{mysqlversion}%{server_suffix}.tar.gz
174+Source: %{src_dir}.tar.gz
175 URL: http://www.percona.com/
176 Packager: %{mysql_vendor} Development Team <mysql-dev@percona.com>
177 Vendor: %{mysql_vendor}
178@@ -337,6 +337,7 @@
179
180 BuildServer() {
181 BuildMySQL "--enable-shared \
182+ --with-server-suffix='%{server_suffix}' \
183 --without-embedded-server \
184 --without-bench \
185 --with-zlib-dir=bundled \
186
187=== modified file 'build/percona-shared-compat.spec'
188--- build/percona-shared-compat.spec 2013-08-27 15:05:45 +0000
189+++ build/percona-shared-compat.spec 2014-08-01 09:50:45 +0000
190@@ -28,7 +28,7 @@
191 #
192 # Change this to match the version of the shared libs you want to include
193 #
194-%define version51 5.1.71
195+%define version51 5.1.73
196 %define version50 5.0.91
197 %define version41 4.1.22
198 %define version40 4.0.27
199@@ -51,7 +51,7 @@
200 Summary: MySQL shared client libraries for MySQL %{version55}, %{version50}, %{version41} and %{version40}
201
202 # We extract the older libraries from mysql-shared-compat and the newer from our sources
203-Source0: MySQL-shared-compat-%{version51}-1.glibc23.%{_arch}.rpm
204+Source0: MySQL-shared-compat-%{version51}-1.rhel5.%{_arch}.rpm
205 #Source1: MySQL-shared-%{version50}-1.%{_arch}.rpm
206 #Source2: MySQL-shared-%{version41}-0.%{_arch}.rpm
207 #Source3: MySQL-shared-%{version40}-0.%{_arch}.rpm

Subscribers

People subscribed via source and target branches