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

[Tomislav Plavcic]

Release branch for version 5.5.37-35.0

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'build-ps/debian/changelog'
--- build-ps/debian/changelog	2014-03-25 13:39:59 +0000
+++ build-ps/debian/changelog	2014-05-07 14:50:27 +0000
@@ -1,3 +1,9 @@
+percona-server-5.5 (5.5.37-rel35.0) unstable; urgency=low
+
+  * Fixed provides/breaks/replaces for client/server debian packages
+
+ -- Tomislav Plavcic <[e-mail]>  Sat, 26 Apr 2014 15:54:31 +0200
+
 percona-server-5.5 (5.5.36-rel34.2) unstable; urgency=low
 
   * Release 5.5.36-34.2

=== modified file 'build-ps/debian/control'
--- build-ps/debian/control	2014-03-31 05:35:44 +0000
+++ build-ps/debian/control	2014-05-07 14:50:27 +0000
@@ -46,18 +46,8 @@
 Package: libperconaserverclient18-dev
 Architecture: any
 Section: libdevel
-Depends: libperconaserverclient-dev (= ${binary:Version}), ${misc:Depends}
-Description: Percona Server database development files - empty transitional 
- package. This is an empty package that depends on libperconaserverclient-dev
- to ease the transition for packages with versioned build-deps on
- libperconaserverclient18-dev.
-
-Package: libperconaserverclient-dev
-Architecture: any
-Section: libdevel
 Depends: libperconaserverclient18 (= ${binary:Version}),
-         zlib1g-dev,
-         ${misc:Depends}
+         zlib1g-dev, ${misc:Depends}
 Breaks: libperconaserverclient16-dev,
         libperconaserverclient15-dev,
         libperconaserverclient14-dev,
@@ -106,7 +96,9 @@
          libperconaserverclient18 (>= ${source:Version}),
          ${shlibs:Depends},
          ${misc:Depends}
-Provides: virtual-mysql-client
+Provides: mysql-client,
+          virtual-mysql-client,
+          virtual-mysql-client-core
 Breaks: mysql-client-5.0,
         mysql-client-core-5.1,
         mysql-client-5.1,
@@ -115,7 +107,9 @@
         percona-server-client-5.1,
         mariadb-client,
         mariadb-client-core-5.5,
-        mariadb-client-5.5
+        mariadb-client-5.5,
+        virtual-mysql-client,
+        virtual-mysql-client-core
 Replaces: mysql-client-5.0,
           mysql-client-core-5.1,
           mysql-client-5.1,
@@ -124,7 +118,9 @@
           percona-server-client-5.1,
           mariadb-client,
           mariadb-client-core-5.5,
-          mariadb-client-5.5
+          mariadb-client-5.5,
+          virtual-mysql-client,
+          virtual-mysql-client-core
 Description: Percona Server database client binaries
  Percona Server is a fast, stable and true multi-user, multi-threaded SQL
  database server. SQL (Structured Query Language) is the most popular database
@@ -149,7 +145,9 @@
          psmisc,
          passwd,
          lsb-base (>= 3.0-10)
-Provides: virtual-mysql-server
+Provides: mysql-server,
+          virtual-mysql-server,
+          virtual-mysql-server-core
 Breaks: mysql-server-5.0,
         mysql-server-5.1,
         mysql-server-5.5,
@@ -158,7 +156,9 @@
         percona-server-server-5.1,
         mariadb-server,
         mariadb-server-core-5.5,
-        mariadb-server-5.5
+        mariadb-server-5.5,
+        virtual-mysql-server,
+        virtual-mysql-server-core
 Replaces: mysql-server-5.0,
           mysql-server-5.1,
           mysql-server-5.5,
@@ -167,7 +167,9 @@
           percona-server-server-5.1,
           mariadb-server,
           mariadb-server-core-5.5,
-          mariadb-server-5.5
+          mariadb-server-5.5,
+          virtual-mysql-server,
+          virtual-mysql-server-core
 Description: Percona Server database server binaries
  Percona Server is a fast, stable and true multi-user, multi-threaded SQL
  database server. SQL (Structured Query Language) is the most popular database
@@ -235,4 +237,4 @@
  query language in the world. The main goals of Percona Server are speed,
  robustness and ease of use.
  .
- This package contains the debugging symbols for the Percona Server binaries.
\ No newline at end of file
+ This package contains the debugging symbols for the Percona Server binaries.

=== renamed file 'build-ps/debian/libperconaserverclient-dev.files' => 'build-ps/debian/libperconaserverclient18-dev.files'
=== modified file 'build-ps/percona-server.spec'
--- build-ps/percona-server.spec	2014-03-31 05:31:05 +0000
+++ build-ps/percona-server.spec	2014-05-07 14:50:27 +0000
@@ -1055,9 +1055,11 @@
 %attr(755, root, root) %{_libdir}/mysql/plugin/libmurmur_udf.so
 %attr(755, root, root) %{_libdir}/mysql/plugin/libmurmur_udf.so.0
 %attr(755, root, root) %{_libdir}/mysql/plugin/libmurmur_udf.so.0.0.0
-
-
-
+# Audit Log and Scalability Metrics files
+%attr(755, root, root) %{_libdir}/mysql/plugin/audit_log.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/audit_log.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/scalability_metrics.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/scalability_metrics.so
 
 %if %{WITH_TCMALLOC}
 %attr(755, root, root) %{_libdir}/mysql/%{malloc_lib_target}
@@ -1161,6 +1163,10 @@
 %doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1*
 
 %changelog
+* Fri Apr 25 2014 Tomislav Plavcic <[e-mail]>
+
+- Added Audit Log and Scalability Metrics plugin binaries
+
 * Thu Feb 10 2011 Ignacio Nin <[e-mail]>
 
 - Removed lines which prevented -debuginfo packages from being built.

=== modified file 'storage/innobase/include/univ.i'
--- storage/innobase/include/univ.i	2014-03-25 13:05:17 +0000
+++ storage/innobase/include/univ.i	2014-05-07 14:50:27 +0000
@@ -64,7 +64,7 @@
 	(INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR)
 
 #ifndef PERCONA_INNODB_VERSION
-#define PERCONA_INNODB_VERSION 34.2
+#define PERCONA_INNODB_VERSION 35.0
 #endif
 
 #define INNODB_VERSION_STR	MYSQL_SERVER_VERSION "-" IB_TO_STR(PERCONA_INNODB_VERSION)