- don't build shared libs for things like master, rpl, binlog etc

diff --git a/mysql-build.patch b/mysql-build.patch
index ea45a7bbb9a1526a4c8986452fa36cc2721b97fb..84970fbbcc6f206bb53f166468ae29b9650201e6 100644 (file)
--- a/mysql-build.patch
+++ b/mysql-build.patch
@@ -1,59 +1,57 @@
-diff -urNbB mysql-5.0.13-rc.org/sql/mysqld.cc mysql-5.0.13-rc/sql/mysqld.cc
---- mysql-5.0.13-rc.org/sql/mysqld.cc  2005-09-22 21:39:56.000000000 +0200
-+++ mysql-5.0.13-rc/sql/mysqld.cc      2005-09-29 19:29:59.991454000 +0200
-@@ -3183,7 +3183,7 @@
-   init_ssl();
+--- mysql-5.7.9/sql/CMakeLists.txt~    2015-10-12 08:21:35.000000000 +0200
++++ mysql-5.7.9/sql/CMakeLists.txt     2015-10-22 13:35:37.172783012 +0200
+@@ -335,7 +335,7 @@
+   )
+ ENDIF()
  
- #ifdef HAVE_LIBWRAP
--  libwrapName= my_progname+dirname_length(my_progname);
-+  libwrapName= (char *)my_progname+dirname_length(my_progname);
-   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/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 @@
+-ADD_LIBRARY(sql STATIC ${SQL_SOURCE})
++ADD_CONVENIENCE_LIBRARY(sql STATIC ${SQL_SOURCE})
+ ADD_DEPENDENCIES(sql GenServerSource)
+ ADD_DEPENDENCIES(sql GenDigestServerSource)
+ ADD_DEPENDENCIES(sql GenBootstrapPriv)
+@@ -362,15 +362,15 @@
                     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)
+                    rpl_filter.cc rpl_record.cc rpl_record_old.cc
+                    rpl_utility.cc rpl_injector.cc rpl_table_access.cc)
 -ADD_LIBRARY(binlog ${BINLOG_SOURCE})
-+ADD_LIBRARY(binlog STATIC ${BINLOG_SOURCE})
- SET (RPL_SOURCE rpl_handler.cc rpl_tblmap.cc)
++ADD_CONVENIENCE_LIBRARY(binlog ${BINLOG_SOURCE})
+ TARGET_LINK_LIBRARIES(binlog binlogevents_static)
+ 
+ SET (RPL_SOURCE rpl_handler.cc rpl_tblmap.cc rpl_context.cc)
  ADD_DEPENDENCIES(binlog GenError)
 -ADD_LIBRARY(rpl ${RPL_SOURCE})
-+ADD_LIBRARY(rpl STATIC ${RPL_SOURCE})
- SET (MASTER_SOURCE rpl_master.cc)
++ADD_CONVENIENCE_LIBRARY(rpl ${RPL_SOURCE})
+ SET (MASTER_SOURCE rpl_master.cc rpl_binlog_sender.cc)
  ADD_DEPENDENCIES(rpl GenError)
 -ADD_LIBRARY(master ${MASTER_SOURCE})
-+ADD_LIBRARY(master STATIC ${MASTER_SOURCE})
++ADD_CONVENIENCE_LIBRARY(master ${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)
+                 rpl_info_handler.cc rpl_info_file.cc
+@@ -379,7 +379,7 @@
+                   rpl_rli_pdb.cc rpl_info_dummy.cc rpl_mts_submode.cc
+                   rpl_slave_commit_order_manager.cc rpl_msr.cc
+                   rpl_trx_boundary_parser.cc rpl_channel_service_interface.cc)
 -ADD_LIBRARY(slave ${SLAVE_SOURCE})
-+ADD_LIBRARY(slave STATIC ${SLAVE_SOURCE})
++ADD_CONVENIENCE_LIBRARY(slave ${SLAVE_SOURCE})
  ADD_DEPENDENCIES(slave GenError)
- ADD_LIBRARY(sqlgunitlib
-   filesort_utils.cc mdl.cc sql_list.cc sql_string.cc thr_malloc.cc
+ 
+ ######################### GUnit Lib #################################
+@@ -396,7 +396,7 @@
+   LIST(APPEND SQL_GUNIT_LIB_SOURCE named_pipe.cc)
+ ENDIF()
+ 
+-ADD_LIBRARY(sqlgunitlib ${SQL_GUNIT_LIB_SOURCE})
++ADD_CONVENIENCE_LIBRARY(sqlgunitlib ${SQL_GUNIT_LIB_SOURCE})
+ ADD_DEPENDENCIES(sqlgunitlib GenError)
+ 
+ ######################### GUnit Lib #################################
+@@ -558,7 +558,7 @@
+ 
+ 
+ IF(WIN32 OR HAVE_DLOPEN AND NOT DISABLE_SHARED)
+-  ADD_LIBRARY(udf_example MODULE udf_example.cc)
++  ADD_CONVENIENCE_LIBRARY(udf_example MODULE udf_example.cc)
+   SET_TARGET_PROPERTIES(udf_example PROPERTIES PREFIX "")
+   # udf_example depends on strings 
+   IF(WIN32)

diff --git a/mysql.spec b/mysql.spec
index ce77266e21474dc1d34f85a6979e276a93d837ba..ec2e34127f32626867f2f2f6b941900a462e2172 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -486,7 +486,7 @@ mv sphinx-*/mysqlse storage/sphinx
 #%patch5 -p1
 #%patch6 -p1 PROBABLY OBSOLETE
 
-#%patch9 -p1
+%patch9 -p1
 #%patch11 -p1
 #%patch12 -p1