Merge lp:~percona-core/percona-server/release-5.6.16-64.0 into lp:percona-server/5.6

[Tomislav Plavcic]

Release branch for PS 5.6.16-64.0

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'Makefile-ps'
--- Makefile-ps	2014-03-03 17:51:33 +0000
+++ Makefile-ps	2014-03-12 11:47:29 +0000
@@ -1,5 +1,5 @@
-MYSQL_VERSION=5.6.15
-PERCONA_SERVER_VERSION=rel62.0
+MYSQL_VERSION=5.6.16
+PERCONA_SERVER_VERSION=rel64.0
 PERCONA_SERVER         ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
 PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
 PERCONA_SERVER_SHORT_2 ?=Percona-Server
 
=== modified file 'build-ps/percona-server.spec'
--- build-ps/percona-server.spec	2014-03-03 17:51:33 +0000
+++ build-ps/percona-server.spec	2014-03-12 11:47:29 +0000
@@ -28,6 +28,7 @@
 %define mysql_version @@MYSQL_VERSION@@
 %define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
 %define percona_server_version @@PERCONA_VERSION@@
+%define revision @@REVISION@@
 
 %define mysqld_user     mysql
 %define mysqld_group    mysql
@@ -96,10 +97,10 @@
 # Server comment strings
 # ----------------------------------------------------------------------------
 %if %{undefined compilation_comment_debug}
-%define compilation_comment_debug       Percona Server - Debug (GPL), Release %{percona_server_version}, Revision %{gotrevision}
+%define compilation_comment_debug       Percona Server - Debug (GPL), Release %{percona_server_version}, Revision %{revision}
 %endif
 %if %{undefined compilation_comment_release}
-%define compilation_comment_release     Percona Server (GPL), Release %{percona_server_version}, Revision %{gotrevision}
+%define compilation_comment_release     Percona Server (GPL), Release %{percona_server_version}, Revision %{revision}
 %endif
 
 
@@ -316,8 +317,6 @@
 %package -n Percona-Server-shared%{product_suffix}
 Summary:        Percona Server - Shared libraries
 Group:          Applications/Databases
-Provides:       mysql-shared mysql-libs
-Obsoletes:	mysql-libs
 
 %description -n Percona-Server-shared%{product_suffix}
 This package contains the shared libraries (*.so*) which certain languages
 
=== modified file 'storage/innobase/include/univ.i'
--- storage/innobase/include/univ.i	2014-02-17 11:12:40 +0000
+++ storage/innobase/include/univ.i	2014-03-12 11:47:29 +0000
@@ -47,7 +47,7 @@
 #define INNODB_VERSION_BUGFIX	MYSQL_VERSION_PATCH
 
 #ifndef PERCONA_INNODB_VERSION
-#define PERCONA_INNODB_VERSION 60.3
+#define PERCONA_INNODB_VERSION 64.0
 #endif
 
 /* Enable UNIV_LOG_ARCHIVE in XtraDB */