Merge lp:~percona-core/percona-server/release-5.5.37-35.0 into lp:percona-server/5.5

Proposed by Tomislav Plavcic on 2014-05-07
Status: Merged
Approved by: Laurynas Biveinis on 2014-05-09
Approved revision: 657
Merged at revision: 656
Proposed branch: lp:~percona-core/percona-server/release-5.5.37-35.0
Merge into: lp:percona-server/5.5
Diff against target: 154 lines (+36/-22)
4 files modified
build-ps/debian/changelog (+6/-0)
build-ps/debian/control (+20/-18)
build-ps/percona-server.spec (+9/-3)
storage/innobase/include/univ.i (+1/-1)
To merge this branch: bzr merge lp:~percona-core/percona-server/release-5.5.37-35.0
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2014-05-07 Approve on 2014-05-09
Review via email: mp+218637@code.launchpad.net

Description of the change

Release branch for version 5.5.37-35.0

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 'build-ps/debian/changelog'
2--- build-ps/debian/changelog 2014-03-25 13:39:59 +0000
3+++ build-ps/debian/changelog 2014-05-07 14:50:27 +0000
4@@ -1,3 +1,9 @@
5+percona-server-5.5 (5.5.37-rel35.0) unstable; urgency=low
6+
7+ * Fixed provides/breaks/replaces for client/server debian packages
8+
9+ -- Tomislav Plavcic <tomislav.plavcic@percona.com> Sat, 26 Apr 2014 15:54:31 +0200
10+
11 percona-server-5.5 (5.5.36-rel34.2) unstable; urgency=low
12
13 * Release 5.5.36-34.2
14
15=== modified file 'build-ps/debian/control'
16--- build-ps/debian/control 2014-03-31 05:35:44 +0000
17+++ build-ps/debian/control 2014-05-07 14:50:27 +0000
18@@ -46,18 +46,8 @@
19 Package: libperconaserverclient18-dev
20 Architecture: any
21 Section: libdevel
22-Depends: libperconaserverclient-dev (= ${binary:Version}), ${misc:Depends}
23-Description: Percona Server database development files - empty transitional
24- package. This is an empty package that depends on libperconaserverclient-dev
25- to ease the transition for packages with versioned build-deps on
26- libperconaserverclient18-dev.
27-
28-Package: libperconaserverclient-dev
29-Architecture: any
30-Section: libdevel
31 Depends: libperconaserverclient18 (= ${binary:Version}),
32- zlib1g-dev,
33- ${misc:Depends}
34+ zlib1g-dev, ${misc:Depends}
35 Breaks: libperconaserverclient16-dev,
36 libperconaserverclient15-dev,
37 libperconaserverclient14-dev,
38@@ -106,7 +96,9 @@
39 libperconaserverclient18 (>= ${source:Version}),
40 ${shlibs:Depends},
41 ${misc:Depends}
42-Provides: virtual-mysql-client
43+Provides: mysql-client,
44+ virtual-mysql-client,
45+ virtual-mysql-client-core
46 Breaks: mysql-client-5.0,
47 mysql-client-core-5.1,
48 mysql-client-5.1,
49@@ -115,7 +107,9 @@
50 percona-server-client-5.1,
51 mariadb-client,
52 mariadb-client-core-5.5,
53- mariadb-client-5.5
54+ mariadb-client-5.5,
55+ virtual-mysql-client,
56+ virtual-mysql-client-core
57 Replaces: mysql-client-5.0,
58 mysql-client-core-5.1,
59 mysql-client-5.1,
60@@ -124,7 +118,9 @@
61 percona-server-client-5.1,
62 mariadb-client,
63 mariadb-client-core-5.5,
64- mariadb-client-5.5
65+ mariadb-client-5.5,
66+ virtual-mysql-client,
67+ virtual-mysql-client-core
68 Description: Percona Server database client binaries
69 Percona Server is a fast, stable and true multi-user, multi-threaded SQL
70 database server. SQL (Structured Query Language) is the most popular database
71@@ -149,7 +145,9 @@
72 psmisc,
73 passwd,
74 lsb-base (>= 3.0-10)
75-Provides: virtual-mysql-server
76+Provides: mysql-server,
77+ virtual-mysql-server,
78+ virtual-mysql-server-core
79 Breaks: mysql-server-5.0,
80 mysql-server-5.1,
81 mysql-server-5.5,
82@@ -158,7 +156,9 @@
83 percona-server-server-5.1,
84 mariadb-server,
85 mariadb-server-core-5.5,
86- mariadb-server-5.5
87+ mariadb-server-5.5,
88+ virtual-mysql-server,
89+ virtual-mysql-server-core
90 Replaces: mysql-server-5.0,
91 mysql-server-5.1,
92 mysql-server-5.5,
93@@ -167,7 +167,9 @@
94 percona-server-server-5.1,
95 mariadb-server,
96 mariadb-server-core-5.5,
97- mariadb-server-5.5
98+ mariadb-server-5.5,
99+ virtual-mysql-server,
100+ virtual-mysql-server-core
101 Description: Percona Server database server binaries
102 Percona Server is a fast, stable and true multi-user, multi-threaded SQL
103 database server. SQL (Structured Query Language) is the most popular database
104@@ -235,4 +237,4 @@
105 query language in the world. The main goals of Percona Server are speed,
106 robustness and ease of use.
107 .
108- This package contains the debugging symbols for the Percona Server binaries.
109\ No newline at end of file
110+ This package contains the debugging symbols for the Percona Server binaries.
111
112=== renamed file 'build-ps/debian/libperconaserverclient-dev.files' => 'build-ps/debian/libperconaserverclient18-dev.files'
113=== modified file 'build-ps/percona-server.spec'
114--- build-ps/percona-server.spec 2014-03-31 05:31:05 +0000
115+++ build-ps/percona-server.spec 2014-05-07 14:50:27 +0000
116@@ -1055,9 +1055,11 @@
117 %attr(755, root, root) %{_libdir}/mysql/plugin/libmurmur_udf.so
118 %attr(755, root, root) %{_libdir}/mysql/plugin/libmurmur_udf.so.0
119 %attr(755, root, root) %{_libdir}/mysql/plugin/libmurmur_udf.so.0.0.0
120-
121-
122-
123+# Audit Log and Scalability Metrics files
124+%attr(755, root, root) %{_libdir}/mysql/plugin/audit_log.so
125+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/audit_log.so
126+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/scalability_metrics.so
127+%attr(755, root, root) %{_libdir}/mysql/plugin/scalability_metrics.so
128
129 %if %{WITH_TCMALLOC}
130 %attr(755, root, root) %{_libdir}/mysql/%{malloc_lib_target}
131@@ -1161,6 +1163,10 @@
132 %doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1*
133
134 %changelog
135+* Fri Apr 25 2014 Tomislav Plavcic <tomislav.plavcic@percona.com>
136+
137+- Added Audit Log and Scalability Metrics plugin binaries
138+
139 * Thu Feb 10 2011 Ignacio Nin <ignacio.nin@percona.com>
140
141 - Removed lines which prevented -debuginfo packages from being built.
142
143=== modified file 'storage/innobase/include/univ.i'
144--- storage/innobase/include/univ.i 2014-03-25 13:05:17 +0000
145+++ storage/innobase/include/univ.i 2014-05-07 14:50:27 +0000
146@@ -64,7 +64,7 @@
147 (INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR)
148
149 #ifndef PERCONA_INNODB_VERSION
150-#define PERCONA_INNODB_VERSION 34.2
151+#define PERCONA_INNODB_VERSION 35.0
152 #endif
153
154 #define INNODB_VERSION_STR MYSQL_SERVER_VERSION "-" IB_TO_STR(PERCONA_INNODB_VERSION)

Subscribers

People subscribed via source and target branches