[packages/mysql] - builds; files need update

[arekm]

commit 3d33faed1968e04921d21517c0cdb7c0d4dd69c0
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Oct 15 19:12:20 2013 +0200

    - builds; files need update

 mysql-build.patch | 31 +++++++++++++++++++++++++++++++
 mysql.spec        |  8 ++++----
 2 files changed, 35 insertions(+), 4 deletions(-)
---
diff --git a/mysql.spec b/mysql.spec
index ce8f5d1..7868579 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -873,7 +873,7 @@ done
 
 %files
 %defattr(644,root,root,755)
-%doc build/support-files/*.cnf build/support-files/*.ini
+%doc build/support-files/*.cnf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
@@ -897,9 +897,9 @@ done
 %attr(755,root,root) %{_libdir}/%{name}/plugin/auth_socket.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/auth_test_plugin.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/dialog.so
-%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_archive.so
-%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_blackhole.so
-%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_federated.so
+#%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_archive.so
+#%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_blackhole.so
+#%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_federated.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/mypluglib.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/qa_auth_client.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/qa_auth_interface.so
diff --git a/mysql-build.patch b/mysql-build.patch
index 11ef6ee..4282730 100644
--- a/mysql-build.patch
+++ b/mysql-build.patch
@@ -10,3 +10,34 @@ diff -urNbB mysql-5.0.13-rc.org/sql/mysqld.cc mysql-5.0.13-rc/sql/mysqld.cc
    openlog(libwrapName, LOG_PID, LOG_AUTH);
  #endif
  
+--- Percona-Server-5.6.13-rel61.0/storage/innobase/row/row0log.cc~	2013-10-07 12:25:25.000000000 +0200
++++ Percona-Server-5.6.13-rel61.0/storage/innobase/row/row0log.cc	2013-10-15 18:28:42.453836505 +0200
+@@ -2364,7 +2364,7 @@
+ 		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;
+@@ -3153,7 +3153,7 @@
+ 		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;
+--- Percona-Server-5.6.13-rel61.0/sql/mysqld.cc~	2013-10-15 18:33:37.000000000 +0200
++++ Percona-Server-5.6.13-rel61.0/sql/mysqld.cc	2013-10-15 18:48:42.717336416 +0200
+@@ -6389,7 +6389,7 @@
+ 
+ #ifdef HAVE_LIBWRAP
+     {
+-      if (mysql_socket_getfd(sock) == mysql_socket_getfd(ip_sock))
++      if (mysql_socket_getfd(sock) == mysql_socket_getfd(base_ip_sock))
+       {
+         struct request_info req;
+         signal(SIGCHLD, SIG_DFL);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/3d33faed1968e04921d21517c0cdb7c0d4dd69c0