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

[Tomislav Plavcic]

Release branch for version 5.6.22-71.0

[Laurynas Biveinis (laurynas-biveinis)]

Does "-DMYSQL_MAINTAINER_MODE=OFF" require an entry in Debian and RPM changelogs?

review: Needs Information

[Tomislav Plavcic (tplavcic)]

Yep you're right. Updated.

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'build-ps/debian/changelog'
--- build-ps/debian/changelog	2014-12-01 07:53:48 +0000
+++ build-ps/debian/changelog	2015-01-13 14:43:26 +0000
@@ -1,3 +1,11 @@
+percona-server-5.6 (5.6.22-rel71.0) unstable; urgency=low
+
+  * init script timeout is too short when resizing logs (bug1328262)
+  * innodb_blocking_buffer_pool_restore cause startup return fail (bug1072538) 
+  * Set MYSQL_MAINTAINER_MODE=OFF for debug build (bug1408232)
+
+ -- Tomislav Plavcic <[e-mail]>  Fri, 09 Jan 2015 17:39:39 +0100
+
 percona-server-5.6 (5.6.21-rel70.1) unstable; urgency=low
 
   * Fixed missing query_response_time plugin mtr tests
 
=== modified file 'build-ps/debian/rules'
--- build-ps/debian/rules	2014-12-16 07:47:59 +0000
+++ build-ps/debian/rules	2015-01-13 14:43:26 +0000
@@ -74,6 +74,7 @@
 		\
 		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
 		-DCMAKE_BUILD_TYPE=Debug \
+		-DMYSQL_MAINTAINER_MODE=OFF \
 		-DWITH_LIBWRAP=ON \
 		-DWITH_ZLIB=system \
 		-DWITH_SSL=system \
 
=== modified file 'build-ps/debian/rules.tokudb'
--- build-ps/debian/rules.tokudb	2014-10-20 15:46:37 +0000
+++ build-ps/debian/rules.tokudb	2015-01-13 14:43:26 +0000
@@ -74,6 +74,7 @@
 		\
 		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
 		-DCMAKE_BUILD_TYPE=Debug \
+		-DMYSQL_MAINTAINER_MODE=OFF \
 		-DWITH_LIBWRAP=ON \
 		-DWITH_ZLIB=system \
 		-DWITH_SSL=system \
 
=== modified file 'build-ps/percona-server.spec'
--- build-ps/percona-server.spec	2014-12-31 11:42:11 +0000
+++ build-ps/percona-server.spec	2015-01-13 14:43:26 +0000
@@ -504,6 +504,7 @@
   # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM
   ${CMAKE} ../ -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
            -DCMAKE_BUILD_TYPE=Debug \
+           -DMYSQL_MAINTAINER_MODE=OFF \
            -DENABLE_DTRACE=OFF \
            -DWITH_EMBEDDED_SERVER=OFF \
            -DWITH_INNODB_MEMCACHED=ON \
@@ -1426,6 +1427,11 @@
 %doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1*
 
 %changelog
+* Fri Jan 09 2015 Tomislav Plavcic <[e-mail]>
+
+- Upgrading a running server does not restart the service (bug1311840)
+- Set MYSQL_MAINTAINER_MODE=OFF for debug build (bug1408232)
+
 * Thu Nov 20 2014 Tomislav Plavcic <[e-mail]>
 
 - Fixed debug symbols on rhel5 (bug 1388972)
 
=== modified file 'storage/innobase/include/univ.i'
--- storage/innobase/include/univ.i	2014-12-16 07:47:59 +0000
+++ storage/innobase/include/univ.i	2015-01-13 14:43:26 +0000
@@ -47,7 +47,7 @@
 #define INNODB_VERSION_BUGFIX	MYSQL_VERSION_PATCH
 
 #ifndef PERCONA_INNODB_VERSION
-#define PERCONA_INNODB_VERSION 70.1
+#define PERCONA_INNODB_VERSION 71.0
 #endif
 
 /* Enable UNIV_LOG_ARCHIVE in XtraDB */