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
1=== modified file 'VERSION'
2--- VERSION 2014-12-16 07:47:59 +0000
3+++ VERSION 2015-02-09 14:22:11 +0000
4@@ -1,4 +1,4 @@
5 MYSQL_VERSION_MAJOR=5
6 MYSQL_VERSION_MINOR=6
7 MYSQL_VERSION_PATCH=22
8-MYSQL_VERSION_EXTRA=-71.0
9+MYSQL_VERSION_EXTRA=-72.0
10
11=== modified file 'build-ps/debian/changelog'
12--- build-ps/debian/changelog 2015-01-13 14:38:41 +0000
13+++ build-ps/debian/changelog 2015-02-09 14:22:11 +0000
14@@ -1,3 +1,9 @@
15+percona-server-5.6 (5.6.22-rel72.0) unstable; urgency=low
16+
17+ * Added ps_tokudb_admin script for TokuDB plugin installation (BLD-212)
18+
19+ -- Tomislav Plavcic <tomislav.plavcic@percona.com> Wed, 04 Feb 2015 20:14:05 +0100
20+
21 percona-server-5.6 (5.6.22-rel71.0) unstable; urgency=low
22
23 * init script timeout is too short when resizing logs (bug1328262)
24
25=== modified file 'build-ps/percona-server.spec'
26--- build-ps/percona-server.spec 2015-01-29 15:49:30 +0000
27+++ build-ps/percona-server.spec 2015-02-09 14:22:11 +0000
28@@ -1460,6 +1460,11 @@
29 %doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1*
30
31 %changelog
32+* Wed Feb 04 2015 Tomislav Plavcic <tomislav.plavcic@percona.com>
33+
34+- Added ps_tokudb_admin script for TokuDB plugin installation (BLD-212)
35+- Fixed TokuDB engine fails after upgrade on centos 5/6 (bug1413956)
36+
37 * Fri Jan 09 2015 Tomislav Plavcic <tomislav.plavcic@percona.com>
38
39 - Upgrading a running server does not restart the service (bug1311840)
40
41=== modified file 'scripts/ps_tokudb_admin.sh'
42--- scripts/ps_tokudb_admin.sh 2015-01-29 14:12:50 +0000
43+++ scripts/ps_tokudb_admin.sh 2015-02-09 14:22:11 +0000
44@@ -176,7 +176,6 @@
45 printf ">> TokuDB plugin is not installed.\n\n"
46 elif [ $STATUS_PLUGIN = 7 ]; then
47 printf ">> TokuDB plugin is installed.\n\n"
48- exit 0
49 else
50 printf ">> TokuDB plugin is partially installed. Please cleanup manually.\n\n"
51 exit 1
52
53=== modified file 'storage/innobase/include/univ.i'
54--- storage/innobase/include/univ.i 2015-01-09 08:45:51 +0000
55+++ storage/innobase/include/univ.i 2015-02-09 14:22:11 +0000
56@@ -47,7 +47,7 @@
57 #define INNODB_VERSION_BUGFIX MYSQL_VERSION_PATCH
58
59 #ifndef PERCONA_INNODB_VERSION
60-#define PERCONA_INNODB_VERSION 71.0
61+#define PERCONA_INNODB_VERSION 72.0
62 #endif
63
64 /* Enable UNIV_LOG_ARCHIVE in XtraDB */

Subscribers

People subscribed via source and target branches

to all changes: