From: Marcin Krol <hawk@tld-linux.org>
Date: Mon, 21 Oct 2013 10:24:40 +0000 (+0000)
Subject: - build fix from PLD
X-Git-Url: https://git.tld-linux.org/?p=packages%2Fmysql.git;a=commitdiff_plain;h=bec4c166551af22572ca80c9e2d09a99eb837aee

- build fix from PLD
---

diff --git a/mysql-build.patch b/mysql-build.patch
index 11ef6ee..42014ac 100644
--- a/mysql-build.patch
+++ b/mysql-build.patch
@@ -10,3 +10,61 @@ 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);
+--- Percona-Server-5.6.13-rel61.0/sql/CMakeLists.txt~	2013-10-07 12:25:25.000000000 +0200
++++ Percona-Server-5.6.13-rel61.0/sql/CMakeLists.txt	2013-10-15 20:37:28.259765844 +0200
+@@ -237,20 +237,20 @@
+                    log_event.cc log_event_old.cc binlog.cc sql_binlog.cc
+ 		   rpl_filter.cc rpl_record.cc rpl_record_old.cc rpl_utility.cc
+ 		   rpl_injector.cc)
+-ADD_LIBRARY(binlog ${BINLOG_SOURCE})
++ADD_LIBRARY(binlog STATIC ${BINLOG_SOURCE})
+ SET (RPL_SOURCE rpl_handler.cc rpl_tblmap.cc)
+ ADD_DEPENDENCIES(binlog GenError)
+-ADD_LIBRARY(rpl ${RPL_SOURCE})
++ADD_LIBRARY(rpl STATIC ${RPL_SOURCE})
+ SET (MASTER_SOURCE rpl_master.cc)
+ ADD_DEPENDENCIES(rpl GenError)
+-ADD_LIBRARY(master ${MASTER_SOURCE})
++ADD_LIBRARY(master STATIC ${MASTER_SOURCE})
+ ADD_DEPENDENCIES(master GenError)
+ SET (SLAVE_SOURCE rpl_slave.cc rpl_reporting.cc rpl_mi.cc rpl_rli.cc
+ 		  rpl_info_handler.cc rpl_info_file.cc rpl_info_table.cc
+ 		  rpl_info_values.cc rpl_info.cc rpl_info_factory.cc
+ 		  rpl_info_table_access.cc dynamic_ids.cc rpl_rli_pdb.cc
+ 		  rpl_info_dummy.cc)
+-ADD_LIBRARY(slave ${SLAVE_SOURCE})
++ADD_LIBRARY(slave STATIC ${SLAVE_SOURCE})
+ ADD_DEPENDENCIES(slave GenError)
+ ADD_LIBRARY(sqlgunitlib
+   filesort_utils.cc mdl.cc sql_list.cc sql_string.cc thr_malloc.cc