Hello community, here is the log from the commit of package xtrabackup for openSUSE:Factory checked in at 2013-08-19 13:31:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xtrabackup (Old) and /work/SRC/openSUSE:Factory/.xtrabackup.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xtrabackup" Changes: -------- --- /work/SRC/openSUSE:Factory/xtrabackup/xtrabackup.changes 2013-08-13 13:10:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xtrabackup.new/xtrabackup.changes 2013-08-19 13:31:13.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 16 14:03:07 CEST 2013 - [email protected] + +- fix build on Factory + * percona-xtrabackup-2.1.x-mysql-5.6.11-srv_buf_size.patch + +------------------------------------------------------------------- New: ---- percona-xtrabackup-2.1.x-mysql-5.6.11-srv_buf_size.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xtrabackup.spec ++++++ --- /var/tmp/diff_new_pack.8sldZg/_old 2013-08-19 13:31:14.000000000 +0200 +++ /var/tmp/diff_new_pack.8sldZg/_new 2013-08-19 13:31:14.000000000 +0200 @@ -31,6 +31,7 @@ Source3: mysql-%{MYSQL_56_VERSION}-nodoc.tar.gz Source4: xtrabackup-nodoc.sh Patch0: percona-xtrabackup-2.1.x-nodoc.patch +Patch1: percona-xtrabackup-2.1.x-mysql-5.6.11-srv_buf_size.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # This is to ease migration from Percona's generic packages Provides: percona-xtrabackup = %{version} @@ -79,6 +80,7 @@ %__find mysql-%{MYSQL_55_VERSION} -maxdepth 1 -type d -iname "doc*" -print && exit 1 %__find mysql-%{MYSQL_56_VERSION} -maxdepth 1 -type d -iname "doc*" -print && exit 1 %patch0 -p1 +%patch1 -p1 %build set -ue ++++++ percona-xtrabackup-2.1.x-mysql-5.6.11-srv_buf_size.patch ++++++ From: Michal Hrusecky <[email protected]> Date: Fri, 16 Aug 2013 14:03:07 +0200 Subject: Rename srv_buf_size variable References: http://bugs.mysql.com/bug.php?id=70047 Upstream: reported Variable was probably renamed sometime in the past but error was not triggered because ifdef was not satisfied. --- mysql-5.6.11/storage/innobase/row/row0log.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: percona-xtrabackup-2.1.4/mysql-5.6.11/storage/innobase/row/row0log.cc =================================================================== --- percona-xtrabackup-2.1.4.orig/mysql-5.6.11/storage/innobase/row/row0log.cc 2013-08-16 19:35:37.000000000 +0100 +++ percona-xtrabackup-2.1.4/mysql-5.6.11/storage/innobase/row/row0log.cc 2013-08-16 19:35:51.000000000 +0100 @@ -2359,7 +2359,7 @@ all_done: and be ignored when the operation is unsupported. */ fallocate(index->online_log->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, - ofs, srv_buf_size); + ofs, srv_sort_buf_size); #endif /* FALLOC_FL_PUNCH_HOLE */ next_mrec = index->online_log->head.block; @@ -3147,7 +3147,7 @@ all_done: and be ignored when the operation is unsupported. */ fallocate(index->online_log->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, - ofs, srv_buf_size); + ofs, srv_sort_buf_size); #endif /* FALLOC_FL_PUNCH_HOLE */ next_mrec = index->online_log->head.block; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
