From d1df2469cd09de3e30751efd5ebfe11778108554 Mon Sep 17 00:00:00 2001 From: Tomislav Plavcic Date: Fri, 20 Feb 2015 14:47:15 +0100 Subject: [PATCH 1/2] Version and changelog update --- VERSION | 2 +- build-ps/debian/changelog | 6 ++++++ build-ps/percona-server.spec | 5 +++++ storage/innobase/include/univ.i | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 3613a59532da..2d66b72d8796 100644 --- a/VERSION +++ b/VERSION @@ -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 diff --git a/build-ps/debian/changelog b/build-ps/debian/changelog index 681a3e95b3d3..61110103adf9 100644 --- a/build-ps/debian/changelog +++ b/build-ps/debian/changelog @@ -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 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) diff --git a/build-ps/percona-server.spec b/build-ps/percona-server.spec index 5f2a02c9a020..e49c15de663c 100644 --- a/build-ps/percona-server.spec +++ b/build-ps/percona-server.spec @@ -1460,6 +1460,11 @@ done %doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1* %changelog +* Wed Feb 04 2015 Tomislav Plavcic + +- 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 - Upgrading a running server does not restart the service (bug1311840) diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index a1eedb416ad4..afb967d6680d 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -47,7 +47,7 @@ Created 1/20/1994 Heikki Tuuri #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 */ From 2c54543ed0f110ae8c0f2039cb9b31f9c3b97042 Mon Sep 17 00:00:00 2001 From: Tomislav Plavcic Date: Fri, 20 Feb 2015 14:48:07 +0100 Subject: [PATCH 2/2] ps_tokudb_admin remove exit if tokudb is installed (causes --disable to not work) --- scripts/ps_tokudb_admin.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ps_tokudb_admin.sh b/scripts/ps_tokudb_admin.sh index 74a6d4b050cf..07c387872313 100644 --- a/scripts/ps_tokudb_admin.sh +++ b/scripts/ps_tokudb_admin.sh @@ -176,7 +176,6 @@ if [ $STATUS_PLUGIN = 0 ]; then 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