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

[Tomislav Plavcic]

Release branch for version 5.6.19-67.0

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'VERSION'
--- VERSION	2014-06-23 11:28:56 +0000
+++ VERSION	2014-07-07 12:35:23 +0000
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=6
 MYSQL_VERSION_PATCH=19
-MYSQL_VERSION_EXTRA=-66.1
+MYSQL_VERSION_EXTRA=-67.0
 
=== modified file 'build-ps/debian/changelog'
--- build-ps/debian/changelog	2014-06-23 11:28:56 +0000
+++ build-ps/debian/changelog	2014-07-07 12:35:23 +0000
@@ -1,3 +1,9 @@
+percona-server-5.6 (5.6.19-rel67.0) unstable; urgency=low
+
+  * Fixed missing libperconaserverclient library
+
+ -- Tomislav Plavcic <[e-mail]>  Thu, 26 Jun 2014 16:55:24 +0200
+
 percona-server-5.6 (5.6.17-rel66.0) unstable; urgency=low
 
   * Added packaging changes regarding TokuDB
 
=== modified file 'build-ps/debian/libperconaserverclient18.1-dev.files'
--- build-ps/debian/libperconaserverclient18.1-dev.files	2014-05-27 08:19:04 +0000
+++ build-ps/debian/libperconaserverclient18.1-dev.files	2014-07-07 12:35:23 +0000
@@ -7,5 +7,12 @@
 usr/lib/*/mysql/plugin/ha_example.*
 usr/lib/*/mysql/plugin/ha_*_plugin.a
 usr/lib/*/mysql/plugin/ha_*_plugin.la
+usr/lib/libperconaserverclient.a*
+usr/lib/libperconaserverclient.so*
+usr/lib/libperconaserverclient_r.a*
+usr/lib/libperconaserverclient_r.so*
+usr/lib/mysql/plugin/ha_example.*
+usr/lib/mysql/plugin/ha_*_plugin.a
+usr/lib/mysql/plugin/ha_*_plugin.la
 usr/share/aclocal/mysql.m4
 usr/share/man/man1/mysql_config.1
 
=== renamed file 'build-ps/debian/libperconaserverclient18.1.install' => 'build-ps/debian/libperconaserverclient18.1.files'
--- build-ps/debian/libperconaserverclient18.1.install	2013-12-20 03:15:04 +0000
+++ build-ps/debian/libperconaserverclient18.1.files	2014-07-07 12:35:23 +0000
@@ -1,1 +1,2 @@
 usr/lib/*/libperconaserverclient*.so.*
+usr/lib/libperconaserverclient*.so.*
 
=== renamed file 'build-ps/debian/libperconaserverclient18.lintian-overrides' => 'build-ps/debian/libperconaserverclient18.1.lintian-overrides'
--- build-ps/debian/libperconaserverclient18.lintian-overrides	2014-03-03 17:51:33 +0000
+++ build-ps/debian/libperconaserverclient18.1.lintian-overrides	2014-07-07 12:35:23 +0000
@@ -1,6 +1,6 @@
 # We are libmysqlclient, so of course we look like it.
-embedded-library binary: usr/lib/*/libperconaserverclient.so.18.0.0
-embedded-library binary: usr/lib/*/libperconaserverclient_r.so.18.0.0
+embedded-library binary: usr/lib/*/libperconaserverclient.so.18.1.0
+embedded-library binary: usr/lib/*/libperconaserverclient_r.so.18.1.0
 
 # no wildcards? :(
-embedded-library binary: usr/lib/x86_64-linux-gnu/libperconaserverclient.so.18.0.0
+embedded-library binary: usr/lib/x86_64-linux-gnu/libperconaserverclient.so.18.1.0
 
=== added file 'build-ps/debian/libperconaserverclient18.1.postinst'
--- build-ps/debian/libperconaserverclient18.1.postinst	1970-01-01 00:00:00 +0000
+++ build-ps/debian/libperconaserverclient18.1.postinst	2014-07-07 12:35:23 +0000
@@ -0,0 +1,14 @@
+#!/bin/bash -e
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+ldconfig
+
+exit 0
+
+# vim: ts=4
+
+
 
=== modified file 'build-ps/percona-server.spec'
--- build-ps/percona-server.spec	2014-06-23 11:28:56 +0000
+++ build-ps/percona-server.spec	2014-07-07 12:35:23 +0000
@@ -1145,7 +1145,6 @@
 %attr(755, root, root) %{_datadir}/percona-server/SELinux
 %attr(755, root, root) %{_datadir}/percona-server/serbian
 %attr(755, root, root) %{_datadir}/percona-server/slovak
-%attr(755, root, root) %{_datadir}/percona-server/solaris
 %attr(755, root, root) %{_datadir}/percona-server/spanish
 %attr(755, root, root) %{_datadir}/percona-server/swedish
 %attr(755, root, root) %{_datadir}/percona-server/ukrainian
@@ -1222,6 +1221,11 @@
         ln -s libperconaserverclient.so.18 %{_libdir}/$lib;
 fi
 done
+for lib in libmysqlclient{.so.18.1.0,_r.so.18.1.0}; do
+if [ ! -f %{_libdir}/$lib ]; then
+        ln -s libperconaserverclient.so.18.1.0 %{_libdir}/$lib;
+fi
+done
 
 /sbin/ldconfig
 
 
=== modified file 'storage/innobase/include/univ.i'
--- storage/innobase/include/univ.i	2014-06-30 11:42:11 +0000
+++ storage/innobase/include/univ.i	2014-07-07 12:35:23 +0000
@@ -47,7 +47,7 @@
 #define INNODB_VERSION_BUGFIX	MYSQL_VERSION_PATCH
 
 #ifndef PERCONA_INNODB_VERSION
-#define PERCONA_INNODB_VERSION 66.0
+#define PERCONA_INNODB_VERSION 67.0
 #endif
 
 /* Enable UNIV_LOG_ARCHIVE in XtraDB */