Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~percona-core/percona-server/release-5.6.19-67.0 into lp:percona-server/5.6

  1. release-5.6.19-67.0
  2. Merge into 5.6
Proposed by Tomislav Plavcic
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 619
Proposed branch: lp:~percona-core/percona-server/release-5.6.19-67.0
Merge into: lp:percona-server/5.6
Diff against target: 117 lines (+38/-6)
8 files modified
VERSION (+1/-1)
build-ps/debian/changelog (+6/-0)
build-ps/debian/libperconaserverclient18.1-dev.files (+7/-0)
build-ps/debian/libperconaserverclient18.1.files (+1/-0)
build-ps/debian/libperconaserverclient18.1.lintian-overrides (+3/-3)
build-ps/debian/libperconaserverclient18.1.postinst (+14/-0)
build-ps/percona-server.spec (+5/-1)
storage/innobase/include/univ.i (+1/-1)
To merge this branch: bzr merge lp:~percona-core/percona-server/release-5.6.19-67.0
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+225818@code.launchpad.net

Description of the change

Release branch for version 5.6.19-67.0

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
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-06-23 11:28:56 +0000
3+++ VERSION 2014-07-07 12:35:23 +0000
4@@ -1,4 +1,4 @@
5 MYSQL_VERSION_MAJOR=5
6 MYSQL_VERSION_MINOR=6
7 MYSQL_VERSION_PATCH=19
8-MYSQL_VERSION_EXTRA=-66.1
9+MYSQL_VERSION_EXTRA=-67.0
10
11=== modified file 'build-ps/debian/changelog'
12--- build-ps/debian/changelog 2014-06-23 11:28:56 +0000
13+++ build-ps/debian/changelog 2014-07-07 12:35:23 +0000
14@@ -1,3 +1,9 @@
15+percona-server-5.6 (5.6.19-rel67.0) unstable; urgency=low
16+
17+ * Fixed missing libperconaserverclient library
18+
19+ -- Tomislav Plavcic <tomislav.plavcic@percona.com> Thu, 26 Jun 2014 16:55:24 +0200
20+
21 percona-server-5.6 (5.6.17-rel66.0) unstable; urgency=low
22
23 * Added packaging changes regarding TokuDB
24
25=== modified file 'build-ps/debian/libperconaserverclient18.1-dev.files'
26--- build-ps/debian/libperconaserverclient18.1-dev.files 2014-05-27 08:19:04 +0000
27+++ build-ps/debian/libperconaserverclient18.1-dev.files 2014-07-07 12:35:23 +0000
28@@ -7,5 +7,12 @@
29 usr/lib/*/mysql/plugin/ha_example.*
30 usr/lib/*/mysql/plugin/ha_*_plugin.a
31 usr/lib/*/mysql/plugin/ha_*_plugin.la
32+usr/lib/libperconaserverclient.a*
33+usr/lib/libperconaserverclient.so*
34+usr/lib/libperconaserverclient_r.a*
35+usr/lib/libperconaserverclient_r.so*
36+usr/lib/mysql/plugin/ha_example.*
37+usr/lib/mysql/plugin/ha_*_plugin.a
38+usr/lib/mysql/plugin/ha_*_plugin.la
39 usr/share/aclocal/mysql.m4
40 usr/share/man/man1/mysql_config.1
41
42=== renamed file 'build-ps/debian/libperconaserverclient18.1.install' => 'build-ps/debian/libperconaserverclient18.1.files'
43--- build-ps/debian/libperconaserverclient18.1.install 2013-12-20 03:15:04 +0000
44+++ build-ps/debian/libperconaserverclient18.1.files 2014-07-07 12:35:23 +0000
45@@ -1,1 +1,2 @@
46 usr/lib/*/libperconaserverclient*.so.*
47+usr/lib/libperconaserverclient*.so.*
48
49=== renamed file 'build-ps/debian/libperconaserverclient18.lintian-overrides' => 'build-ps/debian/libperconaserverclient18.1.lintian-overrides'
50--- build-ps/debian/libperconaserverclient18.lintian-overrides 2014-03-03 17:51:33 +0000
51+++ build-ps/debian/libperconaserverclient18.1.lintian-overrides 2014-07-07 12:35:23 +0000
52@@ -1,6 +1,6 @@
53 # We are libmysqlclient, so of course we look like it.
54-embedded-library binary: usr/lib/*/libperconaserverclient.so.18.0.0
55-embedded-library binary: usr/lib/*/libperconaserverclient_r.so.18.0.0
56+embedded-library binary: usr/lib/*/libperconaserverclient.so.18.1.0
57+embedded-library binary: usr/lib/*/libperconaserverclient_r.so.18.1.0
58
59 # no wildcards? :(
60-embedded-library binary: usr/lib/x86_64-linux-gnu/libperconaserverclient.so.18.0.0
61+embedded-library binary: usr/lib/x86_64-linux-gnu/libperconaserverclient.so.18.1.0
62
63=== added file 'build-ps/debian/libperconaserverclient18.1.postinst'
64--- build-ps/debian/libperconaserverclient18.1.postinst 1970-01-01 00:00:00 +0000
65+++ build-ps/debian/libperconaserverclient18.1.postinst 2014-07-07 12:35:23 +0000
66@@ -0,0 +1,14 @@
67+#!/bin/bash -e
68+
69+# dh_installdeb will replace this with shell code automatically
70+# generated by other debhelper scripts.
71+
72+#DEBHELPER#
73+
74+ldconfig
75+
76+exit 0
77+
78+# vim: ts=4
79+
80+
81
82=== modified file 'build-ps/percona-server.spec'
83--- build-ps/percona-server.spec 2014-06-23 11:28:56 +0000
84+++ build-ps/percona-server.spec 2014-07-07 12:35:23 +0000
85@@ -1145,7 +1145,6 @@
86 %attr(755, root, root) %{_datadir}/percona-server/SELinux
87 %attr(755, root, root) %{_datadir}/percona-server/serbian
88 %attr(755, root, root) %{_datadir}/percona-server/slovak
89-%attr(755, root, root) %{_datadir}/percona-server/solaris
90 %attr(755, root, root) %{_datadir}/percona-server/spanish
91 %attr(755, root, root) %{_datadir}/percona-server/swedish
92 %attr(755, root, root) %{_datadir}/percona-server/ukrainian
93@@ -1222,6 +1221,11 @@
94 ln -s libperconaserverclient.so.18 %{_libdir}/$lib;
95 fi
96 done
97+for lib in libmysqlclient{.so.18.1.0,_r.so.18.1.0}; do
98+if [ ! -f %{_libdir}/$lib ]; then
99+ ln -s libperconaserverclient.so.18.1.0 %{_libdir}/$lib;
100+fi
101+done
102
103 /sbin/ldconfig
104
105
106=== modified file 'storage/innobase/include/univ.i'
107--- storage/innobase/include/univ.i 2014-06-30 11:42:11 +0000
108+++ storage/innobase/include/univ.i 2014-07-07 12:35:23 +0000
109@@ -47,7 +47,7 @@
110 #define INNODB_VERSION_BUGFIX MYSQL_VERSION_PATCH
111
112 #ifndef PERCONA_INNODB_VERSION
113-#define PERCONA_INNODB_VERSION 66.0
114+#define PERCONA_INNODB_VERSION 67.0
115 #endif
116
117 /* Enable UNIV_LOG_ARCHIVE in XtraDB */

Subscribers

People subscribed via source and target branches

to all changes: