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

Proposed by Tomislav Plavcic on 2015-02-09
Status: Merged
Approved by: Laurynas Biveinis on 2015-02-09
Approved revision: 738
Merged at revision: 738
Proposed branch: lp:~percona-core/percona-server/release-5.6.22-72.0
Merge into: lp:percona-server/5.6
Diff against target: 64 lines (+13/-3)
5 files modified
VERSION (+1/-1)
build-ps/debian/changelog (+6/-0)
build-ps/percona-server.spec (+5/-0)
scripts/ps_tokudb_admin.sh (+0/-1)
storage/innobase/include/univ.i (+1/-1)
To merge this branch: bzr merge lp:~percona-core/percona-server/release-5.6.22-72.0
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2015-02-09 Approve on 2015-02-09
Review via email: mp+249077@code.launchpad.net

Description of the change

Release branch for version 5.6.22-72.0

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'VERSION'
--- VERSION 2014-12-16 07:47:59 +0000
+++ VERSION 2015-02-09 14:22:11 +0000
@@ -1,4 +1,4 @@
1MYSQL_VERSION_MAJOR=51MYSQL_VERSION_MAJOR=5
2MYSQL_VERSION_MINOR=62MYSQL_VERSION_MINOR=6
3MYSQL_VERSION_PATCH=223MYSQL_VERSION_PATCH=22
4MYSQL_VERSION_EXTRA=-71.04MYSQL_VERSION_EXTRA=-72.0
55
=== 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 @@
1percona-server-5.6 (5.6.22-rel72.0) unstable; urgency=low
2
3 * Added ps_tokudb_admin script for TokuDB plugin installation (BLD-212)
4
5 -- Tomislav Plavcic <tomislav.plavcic@percona.com> Wed, 04 Feb 2015 20:14:05 +0100
6
1percona-server-5.6 (5.6.22-rel71.0) unstable; urgency=low7percona-server-5.6 (5.6.22-rel71.0) unstable; urgency=low
28
3 * init script timeout is too short when resizing logs (bug1328262)9 * init script timeout is too short when resizing logs (bug1328262)
410
=== 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 @@
1460%doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1*1460%doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1*
14611461
1462%changelog1462%changelog
1463* Wed Feb 04 2015 Tomislav Plavcic <tomislav.plavcic@percona.com>
1464
1465- Added ps_tokudb_admin script for TokuDB plugin installation (BLD-212)
1466- Fixed TokuDB engine fails after upgrade on centos 5/6 (bug1413956)
1467
1463* Fri Jan 09 2015 Tomislav Plavcic <tomislav.plavcic@percona.com>1468* Fri Jan 09 2015 Tomislav Plavcic <tomislav.plavcic@percona.com>
14641469
1465- Upgrading a running server does not restart the service (bug1311840)1470- Upgrading a running server does not restart the service (bug1311840)
14661471
=== 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 @@
176 printf ">> TokuDB plugin is not installed.\n\n"176 printf ">> TokuDB plugin is not installed.\n\n"
177elif [ $STATUS_PLUGIN = 7 ]; then177elif [ $STATUS_PLUGIN = 7 ]; then
178 printf ">> TokuDB plugin is installed.\n\n"178 printf ">> TokuDB plugin is installed.\n\n"
179 exit 0
180else179else
181 printf ">> TokuDB plugin is partially installed. Please cleanup manually.\n\n"180 printf ">> TokuDB plugin is partially installed. Please cleanup manually.\n\n"
182 exit 1181 exit 1
183182
=== 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 @@
47#define INNODB_VERSION_BUGFIX MYSQL_VERSION_PATCH47#define INNODB_VERSION_BUGFIX MYSQL_VERSION_PATCH
4848
49#ifndef PERCONA_INNODB_VERSION49#ifndef PERCONA_INNODB_VERSION
50#define PERCONA_INNODB_VERSION 71.050#define PERCONA_INNODB_VERSION 72.0
51#endif51#endif
5252
53/* Enable UNIV_LOG_ARCHIVE in XtraDB */53/* Enable UNIV_LOG_ARCHIVE in XtraDB */

Subscribers

People subscribed via source and target branches

to all changes: