diff -Naur mysql57-server.orig/Makefile mysql57-server.work/Makefile --- mysql57-server.orig/Makefile 2016-02-07 09:08:20.000000000 +0100 +++ mysql57-server.work/Makefile 2016-02-09 15:36:08.623680000 +0100 @@ -2,12 +2,13 @@ # $FreeBSD: head/databases/mysql57-server/Makefile 408349 2016-02-07 08:08:20Z riggs $ PORTNAME= mysql -PORTVERSION= 5.7.10 -PORTREVISION?= 3 +PORTVERSION= 5.7.11 +#PORTREVISION?= 0 CATEGORIES= databases ipv6 -MASTER_SITES= MYSQL/MySQL-5.7:MySQL SF/boost/boost/1.59.0:boost +MASTER_SITES= MYSQL/MySQL-5.7 PKGNAMESUFFIX?= 57-server -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:MySQL boost_1_59_0.tar.gz:boost +DISTNAME= ${PORTNAME}-boost-${PORTVERSION} +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} MAINTAINER= mokhi64@gmail.com COMMENT= Multithreaded SQL database (server) @@ -25,7 +26,8 @@ BUNDLED_SSL_DESC= SSL/TLS support via (bundled) CyaSSL WITHOUT_SSL_DESC= No SSL/TLS support -CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ +CMAKE_ARGS+= -DINSTALL_LAYOUT=STANDALONE \ + -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_INFODIR="info" \ @@ -40,9 +42,10 @@ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ - -DLOCAL_BOOST_DIR=${WRKDIR}/boost_1_59_0 \ - -DBOOST_INCLUDE_DIR=${WRKDIR}/boost_1_59_0 \ - -DWITH_INNODB_EXTRA_DEBUG=0 + -DWITH_INNODB_EXTRA_DEBUG=0 \ + -DWITH_BOOST=${WRKSRC}/boost \ + -DWITH_LIBEVENT=system \ + -DWITH_ZLIB=system SHEBANG_FILES= scripts/*.pl* scripts/*.sh @@ -112,7 +115,8 @@ PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema" .else -USES+= readline +USES+= libedit +CMAKE_ARGS+= -DWITH_EDITLINE=system .endif .include diff -Naur mysql57-server.orig/distinfo mysql57-server.work/distinfo --- mysql57-server.orig/distinfo 2016-01-10 21:07:48.000000000 +0100 +++ mysql57-server.work/distinfo 2016-02-09 15:36:24.746903000 +0100 @@ -1,4 +1,2 @@ -SHA256 (mysql-5.7.10.tar.gz) = 1ea1644884d086a23eafd8ccb04d517fbd43da3a6a06036f23c5c3a111e25c74 -SIZE (mysql-5.7.10.tar.gz) = 48919371 -SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac -SIZE (boost_1_59_0.tar.gz) = 83709983 +SHA256 (mysql-boost-5.7.11.tar.gz) = ab21347ba004a5aa349b911d829a14e79b1e36e4bcd007d39d75212071414e28 +SIZE (mysql-boost-5.7.11.tar.gz) = 59225677 diff -Naur mysql57-server.orig/files/patch-CMakeLists.txt mysql57-server.work/files/patch-CMakeLists.txt --- mysql57-server.orig/files/patch-CMakeLists.txt 2016-01-10 21:07:48.000000000 +0100 +++ mysql57-server.work/files/patch-CMakeLists.txt 2016-02-09 15:41:12.493203000 +0100 @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2015-11-29 19:16:24 UTC +--- CMakeLists.txt.orig 2016-02-01 23:31:58 UTC +++ CMakeLists.txt -@@ -577,12 +577,10 @@ IF(UNIX) +@@ -587,12 +587,10 @@ IF(UNIX) ENDIF() IF(NOT WITHOUT_SERVER) @@ -13,7 +13,7 @@ ENDIF(WITH_EMBEDDED_SERVER) ENDIF() -@@ -591,8 +589,6 @@ ENDIF() +@@ -601,8 +599,6 @@ ENDIF() ADD_SUBDIRECTORY(scripts) IF(NOT WITHOUT_SERVER) @@ -22,7 +22,7 @@ ADD_SUBDIRECTORY(support-files) IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) ADD_SUBDIRECTORY(internal) -@@ -647,6 +643,7 @@ ENDIF() +@@ -661,6 +657,7 @@ ENDIF() # # RPM installs documentation directly from the source tree # @@ -30,7 +30,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -673,6 +670,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") +@@ -683,6 +680,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() diff -Naur mysql57-server.orig/files/patch-client_CMakeLists.txt mysql57-server.work/files/patch-client_CMakeLists.txt --- mysql57-server.orig/files/patch-client_CMakeLists.txt 2016-01-10 21:07:48.000000000 +0100 +++ mysql57-server.work/files/patch-client_CMakeLists.txt 2016-02-09 15:41:12.495386000 +0100 @@ -1,6 +1,6 @@ ---- client/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC +--- client/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC +++ client/CMakeLists.txt -@@ -38,8 +38,6 @@ ADD_DEFINITIONS( +@@ -32,8 +32,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil ## Subdirectory with common client code. ADD_SUBDIRECTORY(base) @@ -9,8 +9,8 @@ ## We will need libeay32.dll and ssleay32.dll when running client executables. COPY_OPENSSL_DLLS(copy_openssl_client) -@@ -115,11 +113,13 @@ IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_F - ENDIF() +@@ -41,11 +39,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client) + INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake) ADD_DEFINITIONS(${SSL_DEFINES}) +IF(FALSE) @@ -23,7 +23,7 @@ IF(NOT WITHOUT_SERVER) MYSQL_ADD_EXECUTABLE(mysql_upgrade -@@ -139,6 +139,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli +@@ -65,6 +65,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc) TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient) @@ -31,7 +31,7 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc) TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core) -@@ -151,10 +152,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc +@@ -77,10 +78,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) @@ -44,7 +44,7 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) ADD_COMPILE_FLAGS( mysqlbinlog.cc -@@ -171,6 +174,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli +@@ -97,6 +100,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) @@ -52,7 +52,7 @@ MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc) TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient) -@@ -186,9 +190,11 @@ IF(UNIX AND NOT WITHOUT_SERVER) +@@ -112,9 +116,11 @@ IF(UNIX AND NOT WITHOUT_SERVER) ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema) ENDIF() @@ -64,7 +64,7 @@ # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". IF(WIN32) -@@ -197,11 +203,6 @@ ENDIF(WIN32) +@@ -123,11 +129,6 @@ ENDIF(WIN32) SET_TARGET_PROPERTIES ( mysql_plugin diff -Naur mysql57-server.orig/files/patch-cmake_plugin.cmake mysql57-server.work/files/patch-cmake_plugin.cmake --- mysql57-server.orig/files/patch-cmake_plugin.cmake 2016-01-10 21:07:48.000000000 +0100 +++ mysql57-server.work/files/patch-cmake_plugin.cmake 2016-02-09 15:41:12.497566000 +0100 @@ -1,4 +1,4 @@ ---- cmake/plugin.cmake.orig 2015-11-29 19:16:24 UTC +--- cmake/plugin.cmake.orig 2016-02-01 23:31:58 UTC +++ cmake/plugin.cmake @@ -236,9 +236,6 @@ MACRO(MYSQL_ADD_PLUGIN) MYSQL_INSTALL_TARGETS(${target} diff -Naur mysql57-server.orig/files/patch-cmd-line-utils_libedit_chartype.h mysql57-server.work/files/patch-cmd-line-utils_libedit_chartype.h --- mysql57-server.orig/files/patch-cmd-line-utils_libedit_chartype.h 2016-01-10 21:02:30.000000000 +0100 +++ mysql57-server.work/files/patch-cmd-line-utils_libedit_chartype.h 2016-02-09 15:41:12.499750000 +0100 @@ -1,4 +1,4 @@ ---- cmd-line-utils/libedit/chartype.h.orig 2015-11-29 19:16:24 UTC +--- cmd-line-utils/libedit/chartype.h.orig 2016-02-01 23:31:58 UTC +++ cmd-line-utils/libedit/chartype.h @@ -49,7 +49,7 @@ TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */ diff -Naur mysql57-server.orig/files/patch-cmd-line-utils_libedit_vi.c mysql57-server.work/files/patch-cmd-line-utils_libedit_vi.c --- mysql57-server.orig/files/patch-cmd-line-utils_libedit_vi.c 2016-01-10 21:02:30.000000000 +0100 +++ mysql57-server.work/files/patch-cmd-line-utils_libedit_vi.c 2016-02-09 15:41:12.501968000 +0100 @@ -1,4 +1,4 @@ ---- cmd-line-utils/libedit/vi.c.orig 2015-11-29 19:16:24 UTC +--- cmd-line-utils/libedit/vi.c.orig 2016-02-01 23:31:58 UTC +++ cmd-line-utils/libedit/vi.c @@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att * NB: posix implies that we should enter insert mode, however diff -Naur mysql57-server.orig/files/patch-include_CMakeLists.txt mysql57-server.work/files/patch-include_CMakeLists.txt --- mysql57-server.orig/files/patch-include_CMakeLists.txt 2016-02-04 00:11:17.000000000 +0100 +++ mysql57-server.work/files/patch-include_CMakeLists.txt 2016-02-09 15:41:12.504326000 +0100 @@ -1,12 +1,14 @@ ---- include/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC +--- include/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC +++ include/CMakeLists.txt -@@ -69,10 +69,12 @@ SET(HEADERS +@@ -69,6 +69,7 @@ SET(HEADERS + ${HEADERS_GEN_CONFIGURE} ) - + +IF(FALSE) - INSTALL(FILES ../libbinlogevents/export/binary_log_types.h DESTINATION ${INSTALL_INCLUDEDIR}) - INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) - INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development + INSTALL(FILES + ../libbinlogevents/export/binary_log_types.h + DESTINATION ${INSTALL_INCLUDEDIR} +@@ -78,5 +79,6 @@ INSTALL(DIRECTORY mysql/ DESTINATION ${I PATTERN "*.h" PATTERN "psi_abi*" EXCLUDE ) diff -Naur mysql57-server.orig/files/patch-include_my__compare.h mysql57-server.work/files/patch-include_my__compare.h --- mysql57-server.orig/files/patch-include_my__compare.h 2016-01-10 21:02:30.000000000 +0100 +++ mysql57-server.work/files/patch-include_my__compare.h 2016-02-09 15:41:12.506528000 +0100 @@ -1,4 +1,4 @@ ---- include/my_compare.h.orig 2015-11-29 19:16:24 UTC +--- include/my_compare.h.orig 2016-02-01 23:31:58 UTC +++ include/my_compare.h @@ -40,7 +40,7 @@ extern "C" { But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. diff -Naur mysql57-server.orig/files/patch-include_my__thread__os__id.h mysql57-server.work/files/patch-include_my__thread__os__id.h --- mysql57-server.orig/files/patch-include_my__thread__os__id.h 2016-01-10 21:02:30.000000000 +0100 +++ mysql57-server.work/files/patch-include_my__thread__os__id.h 2016-02-09 15:41:12.508741000 +0100 @@ -1,4 +1,4 @@ ---- include/my_thread_os_id.h.orig 2015-11-29 19:16:24 UTC +--- include/my_thread_os_id.h.orig 2016-02-01 23:31:58 UTC +++ include/my_thread_os_id.h @@ -75,8 +75,12 @@ static inline my_thread_os_id_t my_threa return pthread_getthreadid_np(); diff -Naur mysql57-server.orig/files/patch-include_myisam.h mysql57-server.work/files/patch-include_myisam.h --- mysql57-server.orig/files/patch-include_myisam.h 2016-01-10 21:07:48.000000000 +0100 +++ mysql57-server.work/files/patch-include_myisam.h 2016-02-09 15:41:12.510945000 +0100 @@ -1,4 +1,4 @@ ---- include/myisam.h.orig 2015-11-29 19:16:24 UTC +--- include/myisam.h.orig 2016-02-01 23:31:58 UTC +++ include/myisam.h @@ -45,7 +45,7 @@ extern "C" { The following defines can be increased if necessary. diff -Naur mysql57-server.orig/files/patch-libmysql_CMakeLists.txt mysql57-server.work/files/patch-libmysql_CMakeLists.txt --- mysql57-server.orig/files/patch-libmysql_CMakeLists.txt 2016-01-10 21:07:48.000000000 +0100 +++ mysql57-server.work/files/patch-libmysql_CMakeLists.txt 2016-02-09 15:41:12.513133000 +0100 @@ -1,4 +1,4 @@ ---- libmysql/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC +--- libmysql/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC +++ libmysql/CMakeLists.txt @@ -215,7 +215,7 @@ IF(WIN32) ENDIF() diff -Naur mysql57-server.orig/files/patch-libservices_CMakeLists.txt mysql57-server.work/files/patch-libservices_CMakeLists.txt --- mysql57-server.orig/files/patch-libservices_CMakeLists.txt 2016-01-10 21:07:48.000000000 +0100 +++ mysql57-server.work/files/patch-libservices_CMakeLists.txt 2016-02-09 15:41:12.515323000 +0100 @@ -1,4 +1,4 @@ ---- libservices/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC +--- libservices/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC +++ libservices/CMakeLists.txt @@ -34,4 +34,6 @@ SET(MYSQLSERVICES_SOURCES security_context_service.c) diff -Naur mysql57-server.orig/files/patch-man_CMakeLists.txt mysql57-server.work/files/patch-man_CMakeLists.txt --- mysql57-server.orig/files/patch-man_CMakeLists.txt 2016-01-10 21:07:48.000000000 +0100 +++ mysql57-server.work/files/patch-man_CMakeLists.txt 2016-02-09 15:41:12.517510000 +0100 @@ -1,11 +1,13 @@ ---- man/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC +--- man/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC +++ man/CMakeLists.txt -@@ -15,8 +15,6 @@ +@@ -14,9 +14,7 @@ + # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Copy man pages - FILE(GLOB MAN1_FILES *.1) +-FILE(GLOB MAN1_FILES *.1) -FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1) -FILE(GLOB MAN1_NDB ndb*.1) ++FILE(GLOB MAN1_FILES my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1) FILE(GLOB MAN8_FILES *.8) FILE(GLOB MAN8_NDB ndb*.8) IF(MAN1_FILES) diff -Naur mysql57-server.orig/files/patch-mysys__ssl_my__default.cc mysql57-server.work/files/patch-mysys__ssl_my__default.cc --- mysql57-server.orig/files/patch-mysys__ssl_my__default.cc 2016-01-10 21:02:30.000000000 +0100 +++ mysql57-server.work/files/patch-mysys__ssl_my__default.cc 2016-02-09 15:41:12.519712000 +0100 @@ -1,4 +1,4 @@ ---- mysys_ssl/my_default.cc.orig 2015-11-29 19:16:24 UTC +--- mysys_ssl/my_default.cc.orig 2016-02-01 23:31:58 UTC +++ mysys_ssl/my_default.cc @@ -122,7 +122,7 @@ static my_bool is_login_file= FALSE; diff -Naur mysql57-server.orig/files/patch-plugin_password__validation_validate__password.cc mysql57-server.work/files/patch-plugin_password__validation_validate__password.cc --- mysql57-server.orig/files/patch-plugin_password__validation_validate__password.cc 2016-01-10 21:02:30.000000000 +0100 +++ mysql57-server.work/files/patch-plugin_password__validation_validate__password.cc 2016-02-09 15:41:12.521898000 +0100 @@ -1,4 +1,4 @@ ---- plugin/password_validation/validate_password.cc.orig 2015-11-29 19:16:24 UTC +--- plugin/password_validation/validate_password.cc.orig 2016-02-01 23:31:58 UTC +++ plugin/password_validation/validate_password.cc @@ -18,6 +18,8 @@ #include diff -Naur mysql57-server.orig/files/patch-scripts_CMakeLists.txt mysql57-server.work/files/patch-scripts_CMakeLists.txt --- mysql57-server.orig/files/patch-scripts_CMakeLists.txt 2016-01-10 21:07:48.000000000 +0100 +++ mysql57-server.work/files/patch-scripts_CMakeLists.txt 2016-02-09 15:41:12.524092000 +0100 @@ -1,4 +1,4 @@ ---- scripts/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC +--- scripts/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC +++ scripts/CMakeLists.txt @@ -347,6 +347,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) diff -Naur mysql57-server.orig/files/patch-sql_CMakeLists.txt mysql57-server.work/files/patch-sql_CMakeLists.txt --- mysql57-server.orig/files/patch-sql_CMakeLists.txt 2016-01-10 21:07:48.000000000 +0100 +++ mysql57-server.work/files/patch-sql_CMakeLists.txt 2016-02-09 15:41:12.526252000 +0100 @@ -1,4 +1,4 @@ ---- sql/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC +--- sql/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC +++ sql/CMakeLists.txt @@ -24,6 +24,8 @@ INCLUDE_DIRECTORIES( ${ZLIB_INCLUDE_DIR} diff -Naur mysql57-server.orig/files/patch-sql_conn__handler_socket__connection.cc mysql57-server.work/files/patch-sql_conn__handler_socket__connection.cc --- mysql57-server.orig/files/patch-sql_conn__handler_socket__connection.cc 2016-01-10 21:02:30.000000000 +0100 +++ mysql57-server.work/files/patch-sql_conn__handler_socket__connection.cc 2016-02-09 15:41:12.528493000 +0100 @@ -1,4 +1,4 @@ ---- sql/conn_handler/socket_connection.cc.orig 2015-11-29 19:16:24 UTC +--- sql/conn_handler/socket_connection.cc.orig 2016-02-01 23:31:58 UTC +++ sql/conn_handler/socket_connection.cc @@ -939,20 +939,23 @@ Channel_info* Mysqld_socket_listener::li signal(SIGCHLD, SIG_DFL); diff -Naur mysql57-server.orig/files/patch-sql_sql__view.cc mysql57-server.work/files/patch-sql_sql__view.cc --- mysql57-server.orig/files/patch-sql_sql__view.cc 2016-01-10 21:02:30.000000000 +0100 +++ mysql57-server.work/files/patch-sql_sql__view.cc 2016-02-09 15:41:12.530674000 +0100 @@ -1,4 +1,4 @@ ---- sql/sql_view.cc.orig 2015-11-29 19:16:24 UTC +--- sql/sql_view.cc.orig 2016-02-01 23:31:58 UTC +++ sql/sql_view.cc @@ -768,46 +768,46 @@ static const int required_view_parameter */ diff -Naur mysql57-server.orig/files/patch-sql_sys__vars.cc mysql57-server.work/files/patch-sql_sys__vars.cc --- mysql57-server.orig/files/patch-sql_sys__vars.cc 2016-01-10 21:02:30.000000000 +0100 +++ mysql57-server.work/files/patch-sql_sys__vars.cc 2016-02-09 15:41:12.532864000 +0100 @@ -1,4 +1,4 @@ ---- sql/sys_vars.cc.orig 2015-11-29 19:16:24 UTC +--- sql/sys_vars.cc.orig 2016-02-01 23:31:58 UTC +++ sql/sys_vars.cc @@ -1734,7 +1734,7 @@ static Sys_var_ulong Sys_interactive_tim "connection before closing it", @@ -9,7 +9,7 @@ static Sys_var_ulong Sys_join_buffer_size( "join_buffer_size", -@@ -2562,7 +2562,7 @@ static Sys_var_ulong Sys_net_read_timeou +@@ -2568,7 +2568,7 @@ static Sys_var_ulong Sys_net_read_timeou "Number of seconds to wait for more data from a connection before " "aborting the read", SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG), @@ -18,7 +18,7 @@ NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_net_read_timeout)); -@@ -2578,7 +2578,7 @@ static Sys_var_ulong Sys_net_write_timeo +@@ -2584,7 +2584,7 @@ static Sys_var_ulong Sys_net_write_timeo "Number of seconds to wait for a block to be written to a connection " "before aborting the write", SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG), @@ -27,7 +27,7 @@ NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_net_write_timeout)); -@@ -4031,7 +4031,7 @@ static Sys_var_ulong Sys_net_wait_timeou +@@ -4034,7 +4034,7 @@ static Sys_var_ulong Sys_net_wait_timeou "The number of seconds the server waits for activity on a " "connection before closing it", SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG), diff -Naur mysql57-server.orig/files/patch-storage_innobase_include_srv0mon.h mysql57-server.work/files/patch-storage_innobase_include_srv0mon.h --- mysql57-server.orig/files/patch-storage_innobase_include_srv0mon.h 2016-01-10 21:02:30.000000000 +0100 +++ mysql57-server.work/files/patch-storage_innobase_include_srv0mon.h 2016-02-09 15:41:12.535064000 +0100 @@ -1,4 +1,4 @@ ---- storage/innobase/include/srv0mon.h.orig 2015-11-29 19:16:24 UTC +--- storage/innobase/include/srv0mon.h.orig 2016-02-01 23:31:58 UTC +++ storage/innobase/include/srv0mon.h @@ -34,6 +34,10 @@ Created 12/15/2009 Jimmy Yang /* Required for FreeBSD so that INT64_MAX is defined. */ diff -Naur mysql57-server.orig/files/patch-storage_myisam_mi__dynrec.c mysql57-server.work/files/patch-storage_myisam_mi__dynrec.c --- mysql57-server.orig/files/patch-storage_myisam_mi__dynrec.c 2016-01-10 21:02:30.000000000 +0100 +++ mysql57-server.work/files/patch-storage_myisam_mi__dynrec.c 2016-02-09 15:41:12.537243000 +0100 @@ -1,4 +1,4 @@ ---- storage/myisam/mi_dynrec.c.orig 2015-11-29 19:16:24 UTC +--- storage/myisam/mi_dynrec.c.orig 2016-02-01 23:31:58 UTC +++ storage/myisam/mi_dynrec.c @@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my DBUG_RETURN(1); diff -Naur mysql57-server.orig/files/patch-support-files_CMakeLists.txt mysql57-server.work/files/patch-support-files_CMakeLists.txt --- mysql57-server.orig/files/patch-support-files_CMakeLists.txt 2016-01-10 21:07:48.000000000 +0100 +++ mysql57-server.work/files/patch-support-files_CMakeLists.txt 2016-02-09 15:41:12.539451000 +0100 @@ -1,4 +1,4 @@ ---- support-files/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC +--- support-files/CMakeLists.txt.orig 2016-02-01 23:31:58 UTC +++ support-files/CMakeLists.txt @@ -69,7 +69,9 @@ IF(UNIX) INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) diff -Naur mysql57-server.orig/pkg-plist mysql57-server.work/pkg-plist --- mysql57-server.orig/pkg-plist 2016-02-04 00:11:17.000000000 +0100 +++ mysql57-server.work/pkg-plist 2016-02-09 15:30:52.769356000 +0100 @@ -25,6 +25,7 @@ lib/mysql/plugin/auth_test_plugin.so lib/mysql/plugin/daemon_example.ini %%NO_EXAMPLE%%lib/mysql/plugin/ha_example.so +lib/mysql/plugin/keyring_file.so lib/mysql/plugin/libdaemon_example.so lib/mysql/plugin/libtest_framework.so lib/mysql/plugin/libtest_services.so