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

[Tomislav Plavcic]

Release branch for version 5.5.37-35.1

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'VERSION'
--- VERSION	2014-03-27 15:42:21 +0000
+++ VERSION	2014-06-04 13:05:03 +0000
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=5
 MYSQL_VERSION_PATCH=37
-MYSQL_VERSION_EXTRA=-35.0
+MYSQL_VERSION_EXTRA=-35.1
 
=== modified file 'build-ps/debian/changelog'
--- build-ps/debian/changelog	2014-04-26 13:57:29 +0000
+++ build-ps/debian/changelog	2014-06-04 13:05:03 +0000
@@ -1,3 +1,10 @@
+percona-server-5.5 (5.5.37-rel35.1) unstable; urgency=low
+
+  * UDF and HandlerSocket moved to plugin
+  * Fixed version reported by mysql client
+
+ -- Tomislav Plavcic <[e-mail]>  Thu, 29 May 2014 11:14:29 +0200
+
 percona-server-5.5 (5.5.37-rel35.0) unstable; urgency=low
 
   * Fixed provides/breaks/replaces for client/server debian packages
 
=== modified file 'build-ps/percona-server.spec'
--- build-ps/percona-server.spec	2014-05-28 07:24:38 +0000
+++ build-ps/percona-server.spec	2014-06-04 13:05:03 +0000
@@ -1141,6 +1141,11 @@
 %doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1*
 
 %changelog
+* Thu May 29 2014 Tomislav Plavcic <[e-mail]>
+
+- UDF and HandlerSocket moved to plugin
+- Fixed version reported in mysql client
+
 * Fri Apr 25 2014 Tomislav Plavcic <[e-mail]>
 
 - Added Audit Log and Scalability Metrics plugin binaries
 
=== modified file 'storage/innobase/include/univ.i'
--- storage/innobase/include/univ.i	2014-04-26 13:57:29 +0000
+++ storage/innobase/include/univ.i	2014-06-04 13:05:03 +0000
@@ -64,7 +64,7 @@
 	(INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR)
 
 #ifndef PERCONA_INNODB_VERSION
-#define PERCONA_INNODB_VERSION 35.0
+#define PERCONA_INNODB_VERSION 35.1
 #endif
 
 #define INNODB_VERSION_STR	MYSQL_SERVER_VERSION "-" IB_TO_STR(PERCONA_INNODB_VERSION)