Hello community,
here is the log from the commit of package mysql-community-server for
openSUSE:Factory checked in at 2013-08-15 16:24:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mysql-community-server (Old)
and /work/SRC/openSUSE:Factory/.mysql-community-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-community-server"
Changes:
--------
---
/work/SRC/openSUSE:Factory/mysql-community-server/mysql-community-server.changes
2013-08-13 10:15:58.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.mysql-community-server.new/mysql-community-server.changes
2013-08-15 16:24:46.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Aug 15 15:55:26 CEST 2013 - mhruse...@suse.cz
+
+- fix build for Factory
+ * mysql-community-server-5.6.12-srv_buf_size.patch
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mysql-community-server.spec ++++++
--- /var/tmp/diff_new_pack.UTNycJ/_old 2013-08-15 16:24:47.000000000 +0200
+++ /var/tmp/diff_new_pack.UTNycJ/_new 2013-08-15 16:24:47.000000000 +0200
@@ -465,7 +465,7 @@
%posttrans
if [ -d /var/lib/mysql ]; then
touch /var/lib/mysql/.run-mysql_upgrade
- chown -R mysql:mysql /var/lib/mysql
+ chown -R --no-dereference mysql:mysql /var/lib/mysql
fi
for i in /var/lib/mysql/{.protected,.tmp}; do
( [ -d "$i" ] && rmdir "$i" ) || :
++++++ build.inc ++++++
--- /var/tmp/diff_new_pack.UTNycJ/_old 2013-08-15 16:24:47.000000000 +0200
+++ /var/tmp/diff_new_pack.UTNycJ/_new 2013-08-15 16:24:47.000000000 +0200
@@ -114,8 +114,8 @@
-DWITH_EMBEDDED_SERVER=true
\
-DCOMPILATION_COMMENT="openSUSE package"
\
-DDENABLE_DOWNLOADS=false
\
- -DINSTALL_PLUGINDIR_RPM="%{_libdir}/mysql/plugin"
\
- -DINSTALL_LIBDIR_RPM="%{_libdir}"
\
+ -DINSTALL_PLUGINDIR_RPM="%{_lib}/mysql/plugin"
\
+ -DINSTALL_LIBDIR_RPM="%{_lib}"
\
"$@" ..
make %{?jobs:-j%jobs}
nm --numeric-sort sql/mysqld > sql/mysqld.sym
++++++ configuration-tweaks.tar.bz2 ++++++
++++++ install.inc ++++++
--- /var/tmp/diff_new_pack.UTNycJ/_old 2013-08-15 16:24:47.000000000 +0200
+++ /var/tmp/diff_new_pack.UTNycJ/_new 2013-08-15 16:24:47.000000000 +0200
@@ -1,5 +1,4 @@
# install the debug server first, so that we don't overwrite the standard
-# /usr/sbin/mysqld
mkdir -p %buildroot%_libdir/mysql
make -C _build-debug/sql install DESTDIR=%buildroot
mv %buildroot/usr/sbin/mysqld %buildroot/usr/sbin/mysqld-debug
@@ -10,16 +9,13 @@
# remove handler socket client
rm -f %buildroot%_libdir/libhsclient*
rm -f %buildroot%_bindir/hsclient*
-if [ -f "%{buildroot}%{_bindir}/mytop" ]; then
- mv %{buildroot}%{_bindir}/mytop %{buildroot}%{_bindir}/%{name}_mytop
-fi
+[ \! -f "%{buildroot}%{_bindir}/mytop" ] || mv %{buildroot}%{_bindir}/mytop
%{buildroot}%{_bindir}/%{name}_mytop
rm -f %buildroot%_libdir/mysql/plugin/handlersocket.so
# remove most static libs (FIXME: don't build them at all...)
[ \! -f "%buildroot%_libdir/"libmysqld.a ] || mv
"%buildroot%_libdir/"libmysqld.a "%buildroot%_libdir/"libmysqld.static
rm -f %buildroot%_libdir/*.a
[ \! -f "%buildroot%_libdir/"libmysqld.static ] || mv
"%buildroot%_libdir/"libmysqld.static "%buildroot%_libdir/"libmysqld.a
rm -f %buildroot%_libdir/mysql/{,plugin}/*.{a,la}
-# XXX: package these? The ndb tools are linked statically atm
rm -f %buildroot%_libdir/mysql/libndbclient.*
rm -f %{buildroot}/usr/share/mysql-test/{mysql-test-run,mtr}
rm -f
%{buildroot}/usr/share/mysql/{binary-configure,errmsg-utf8.txt,magic,mysql-log-rotate,mysql*.server}
@@ -27,8 +23,7 @@
ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mtr
ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mysql-test-run
mv %{buildroot}/usr/share/mysql-test/lib/My/SafeProcess/my_safe_process
%{buildroot}%{_bindir}
-# generate filelist for binaries and their manpages (easier than enumerating
-# all the binaries and manapages manually
+# generate filelist for binaries and their manpages
filelist()
{
echo '%%defattr(-, root, root)'
++++++ my.ini ++++++
--- /var/tmp/diff_new_pack.UTNycJ/_old 2013-08-15 16:24:47.000000000 +0200
+++ /var/tmp/diff_new_pack.UTNycJ/_new 2013-08-15 16:24:47.000000000 +0200
@@ -98,6 +98,6 @@
# socket = /var/lib/mysql-databases/mysqld6/mysql.sock
# user = mysql
-!include_dir /etc/mysql
-!include_dir /etc/my.cnf.d
+!includedir /etc/mysql
+!includedir /etc/my.cnf.d
++++++ mysql-patches.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mysql-patches/mysql-patches/mysql-community-server-5.6.12-srv_buf_size.patch
new/mysql-patches/mysql-patches/mysql-community-server-5.6.12-srv_buf_size.patch
---
old/mysql-patches/mysql-patches/mysql-community-server-5.6.12-srv_buf_size.patch
1970-01-01 01:00:00.000000000 +0100
+++
new/mysql-patches/mysql-patches/mysql-community-server-5.6.12-srv_buf_size.patch
2013-08-15 13:58:09.000000000 +0200
@@ -0,0 +1,30 @@
+PATCH-P0-FIX-UPSTREAM: Rename srv_buf_size variable
+BUGS: upstream#70047
+
+Variable was probably renamed sometime in the past but error was not triggered
+because ifdef was not satisfied.
+
+Maintainer: Michal Hrusecky <mhruse...@suse.cz>
+
+Index: storage/innobase/row/row0log.cc
+===================================================================
+--- storage/innobase/row/row0log.cc.orig
++++ storage/innobase/row/row0log.cc
+@@ -2364,7 +2364,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;
+@@ -3152,7 +3152,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;
++++++ series ++++++
--- /var/tmp/diff_new_pack.UTNycJ/_old 2013-08-15 16:24:47.000000000 +0200
+++ /var/tmp/diff_new_pack.UTNycJ/_new 2013-08-15 16:24:47.000000000 +0200
@@ -10,3 +10,4 @@
mysql-community-server-5.6.12-deharcode-libdir.patch
mysql-5.5.31-upgrade-datadir.patch
mysql-5.5-dump.patch
+mysql-community-server-5.6.12-srv_buf_size.patch
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
