Merge lp:~percona-core/percona-server/release-5.6.22-72.0 into lp:percona-server/5.6

[Tomislav Plavcic]

Release branch for version 5.6.22-72.0

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'VERSION'
--- VERSION	2014-12-16 07:47:59 +0000
+++ VERSION	2015-02-09 14:22:11 +0000
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=6
 MYSQL_VERSION_PATCH=22
-MYSQL_VERSION_EXTRA=-71.0
+MYSQL_VERSION_EXTRA=-72.0
 
=== modified file 'build-ps/debian/changelog'
--- build-ps/debian/changelog	2015-01-13 14:38:41 +0000
+++ build-ps/debian/changelog	2015-02-09 14:22:11 +0000
@@ -1,3 +1,9 @@
+percona-server-5.6 (5.6.22-rel72.0) unstable; urgency=low
+
+  * Added ps_tokudb_admin script for TokuDB plugin installation (BLD-212)
+
+ -- Tomislav Plavcic <[e-mail]>  Wed, 04 Feb 2015 20:14:05 +0100
+
 percona-server-5.6 (5.6.22-rel71.0) unstable; urgency=low
 
   * init script timeout is too short when resizing logs (bug1328262)
 
=== modified file 'build-ps/percona-server.spec'
--- build-ps/percona-server.spec	2015-01-29 15:49:30 +0000
+++ build-ps/percona-server.spec	2015-02-09 14:22:11 +0000
@@ -1460,6 +1460,11 @@
 %doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1*
 
 %changelog
+* Wed Feb 04 2015 Tomislav Plavcic <[e-mail]>
+
+- Added ps_tokudb_admin script for TokuDB plugin installation (BLD-212)
+- Fixed TokuDB engine fails after upgrade on centos 5/6 (bug1413956)
+
 * Fri Jan 09 2015 Tomislav Plavcic <[e-mail]>
 
 - Upgrading a running server does not restart the service (bug1311840)
 
=== modified file 'scripts/ps_tokudb_admin.sh'
--- scripts/ps_tokudb_admin.sh	2015-01-29 14:12:50 +0000
+++ scripts/ps_tokudb_admin.sh	2015-02-09 14:22:11 +0000
@@ -176,7 +176,6 @@
   printf ">> TokuDB plugin is not installed.\n\n"
 elif [ $STATUS_PLUGIN = 7 ]; then
   printf ">> TokuDB plugin is installed.\n\n"
-  exit 0
 else
   printf ">> TokuDB plugin is partially installed. Please cleanup manually.\n\n"
   exit 1
 
=== modified file 'storage/innobase/include/univ.i'
--- storage/innobase/include/univ.i	2015-01-09 08:45:51 +0000
+++ storage/innobase/include/univ.i	2015-02-09 14:22:11 +0000
@@ -47,7 +47,7 @@
 #define INNODB_VERSION_BUGFIX	MYSQL_VERSION_PATCH
 
 #ifndef PERCONA_INNODB_VERSION
-#define PERCONA_INNODB_VERSION 71.0
+#define PERCONA_INNODB_VERSION 72.0
 #endif
 
 /* Enable UNIV_LOG_ARCHIVE in XtraDB */