Date: Sat, 2 Nov 2019 15:18:26 +0000 (UTC) From: Vasil Dimov <vd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r516331 - in head/databases/mysqlwsrep56-server: . files Message-ID: <201911021518.xA2FIQuk088076@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vd Date: Sat Nov 2 15:18:26 2019 New Revision: 516331 URL: https://svnweb.freebsd.org/changeset/ports/516331 Log: databases/mysqlwsrep56-server: upgrade 5.6.45-25.27 -> 5.6.46-25.28 PR: 241533 Submitted by: Teemu Ollakka <teemu.ollakka@galeracluster.com> Relnotes: http://releases.galeracluster.com/mysql-wsrep-5.6.46-25.28/release-notes-mysql-wsrep-5.6.46-25.28.txt Deleted: head/databases/mysqlwsrep56-server/files/patch-PR225888.diff Modified: head/databases/mysqlwsrep56-server/Makefile head/databases/mysqlwsrep56-server/distinfo head/databases/mysqlwsrep56-server/files/patch-CMakeLists.txt head/databases/mysqlwsrep56-server/files/patch-client_CMakeLists.txt head/databases/mysqlwsrep56-server/files/patch-cmake_plugin.cmake head/databases/mysqlwsrep56-server/files/patch-cmake_ssl.cmake head/databases/mysqlwsrep56-server/files/patch-extra_CMakeLists.txt head/databases/mysqlwsrep56-server/files/patch-include_CMakeLists.txt head/databases/mysqlwsrep56-server/files/patch-include_my__compare.h head/databases/mysqlwsrep56-server/files/patch-include_myisam.h head/databases/mysqlwsrep56-server/files/patch-libmysql_CMakeLists.txt head/databases/mysqlwsrep56-server/files/patch-libservices_CMakeLists.txt head/databases/mysqlwsrep56-server/files/patch-man_CMakeLists.txt head/databases/mysqlwsrep56-server/files/patch-mysys__ssl_my__default.cc head/databases/mysqlwsrep56-server/files/patch-plugin_password__validation_validate__password.cc head/databases/mysqlwsrep56-server/files/patch-scripts_CMakeLists.txt head/databases/mysqlwsrep56-server/files/patch-sql_CMakeLists.txt head/databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc head/databases/mysqlwsrep56-server/files/patch-support-files_CMakeLists.txt Modified: head/databases/mysqlwsrep56-server/Makefile ============================================================================== --- head/databases/mysqlwsrep56-server/Makefile Sat Nov 2 14:43:56 2019 (r516330) +++ head/databases/mysqlwsrep56-server/Makefile Sat Nov 2 15:18:26 2019 (r516331) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= mysqlwsrep -PORTVERSION?= 5.6.45 +PORTVERSION?= 5.6.46 DISTVERSIONPREFIX?= wsrep_ -DISTVERSIONSUFFIX?= -25.27 -PORTREVISION?= 1 +DISTVERSIONSUFFIX?= -25.28 +PORTREVISION?= 0 CATEGORIES= databases PKGNAMESUFFIX= 56-server @@ -80,6 +80,7 @@ CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DOPENSSL_LIBRARY=${OPENSSLLIB}/libssl.so \ -DINSTALL_MYSQLTESTDIR=0 \ -DWITH_LIBWRAP=1 \ + -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ -DWITH_WSREP=1 SHEBANG_FILES= scripts/*.pl* scripts/*.sh scripts/wsrep_sst_* Modified: head/databases/mysqlwsrep56-server/distinfo ============================================================================== --- head/databases/mysqlwsrep56-server/distinfo Sat Nov 2 14:43:56 2019 (r516330) +++ head/databases/mysqlwsrep56-server/distinfo Sat Nov 2 15:18:26 2019 (r516331) @@ -1,5 +1,5 @@ -TIMESTAMP = 1567524448 -SHA256 (codership-mysql-wsrep-wsrep_5.6.45-25.27_GH0.tar.gz) = 670c622644a9a271db810b193eb7eea3693b5ec6e25c38a26e22cd1f4e551d73 -SIZE (codership-mysql-wsrep-wsrep_5.6.45-25.27_GH0.tar.gz) = 32782117 +TIMESTAMP = 1571904979 +SHA256 (codership-mysql-wsrep-wsrep_5.6.46-25.28_GH0.tar.gz) = b15b3ffdc357fec52f2a03be30164879ae69739755c8f61a7c99e6bc7046f02f +SIZE (codership-mysql-wsrep-wsrep_5.6.46-25.28_GH0.tar.gz) = 32659765 SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0 SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032 Modified: head/databases/mysqlwsrep56-server/files/patch-CMakeLists.txt ============================================================================== --- head/databases/mysqlwsrep56-server/files/patch-CMakeLists.txt Sat Nov 2 14:43:56 2019 (r516330) +++ head/databases/mysqlwsrep56-server/files/patch-CMakeLists.txt Sat Nov 2 15:18:26 2019 (r516331) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2019-07-16 14:08:43 UTC +--- CMakeLists.txt.orig 2019-10-21 05:17:49 UTC +++ CMakeLists.txt -@@ -532,12 +532,10 @@ IF(UNIX) +@@ -568,12 +568,10 @@ IF(UNIX) ENDIF() IF(NOT WITHOUT_SERVER) @@ -13,7 +13,7 @@ ENDIF(WITH_EMBEDDED_SERVER) ENDIF() -@@ -546,10 +544,7 @@ ENDIF() +@@ -582,10 +580,7 @@ ENDIF() ADD_SUBDIRECTORY(scripts) IF(NOT WITHOUT_SERVER) @@ -24,15 +24,15 @@ IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) ADD_SUBDIRECTORY(internal) ENDIF() -@@ -608,6 +603,7 @@ ENDIF() +@@ -644,6 +639,7 @@ ENDIF() # # RPM installs documentation directly from the source tree # +IF(FALSE) IF(NOT INSTALL_LAYOUT MATCHES "RPM") - INSTALL(FILES COPYING LICENSE.mysql - DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -630,6 +626,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") + INSTALL(FILES + README +@@ -664,6 +660,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") PATTERN "mysql.info" EXCLUDE PATTERN "sp-imp-spec.txt" EXCLUDE ) Modified: head/databases/mysqlwsrep56-server/files/patch-client_CMakeLists.txt ============================================================================== --- head/databases/mysqlwsrep56-server/files/patch-client_CMakeLists.txt Sat Nov 2 14:43:56 2019 (r516330) +++ head/databases/mysqlwsrep56-server/files/patch-client_CMakeLists.txt Sat Nov 2 15:18:26 2019 (r516331) @@ -1,8 +1,8 @@ ---- client/CMakeLists.txt.orig 2019-07-16 14:08:43 UTC +--- client/CMakeLists.txt.orig 2019-10-21 05:17:49 UTC +++ client/CMakeLists.txt -@@ -30,17 +30,20 @@ INCLUDE_DIRECTORIES( - COPY_OPENSSL_DLLS(copy_openssl_client) +@@ -34,17 +34,20 @@ INCLUDE_DIRECTORIES( + ADD_DEFINITIONS(${SSL_DEFINES}) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc) @@ -21,7 +21,7 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) -@@ -50,17 +53,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlclient) +@@ -54,17 +57,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlclient) MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) @@ -43,7 +43,7 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) -@@ -73,6 +80,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlclient) +@@ -77,6 +84,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlclient) MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) @@ -51,7 +51,7 @@ # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". IF(WIN32) -@@ -82,11 +90,6 @@ ENDIF(WIN32) +@@ -86,11 +94,6 @@ ENDIF(WIN32) SET_TARGET_PROPERTIES ( mysql_plugin mysql_upgrade Modified: head/databases/mysqlwsrep56-server/files/patch-cmake_plugin.cmake ============================================================================== --- head/databases/mysqlwsrep56-server/files/patch-cmake_plugin.cmake Sat Nov 2 14:43:56 2019 (r516330) +++ head/databases/mysqlwsrep56-server/files/patch-cmake_plugin.cmake Sat Nov 2 15:18:26 2019 (r516331) @@ -1,6 +1,6 @@ ---- cmake/plugin.cmake.orig 2019-07-16 14:08:43 UTC +--- cmake/plugin.cmake.orig 2019-10-21 05:17:49 UTC +++ cmake/plugin.cmake -@@ -216,9 +216,6 @@ MACRO(MYSQL_ADD_PLUGIN) +@@ -223,9 +223,6 @@ MACRO(MYSQL_ADD_PLUGIN) MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} COMPONENT ${INSTALL_COMPONENT}) Modified: head/databases/mysqlwsrep56-server/files/patch-cmake_ssl.cmake ============================================================================== --- head/databases/mysqlwsrep56-server/files/patch-cmake_ssl.cmake Sat Nov 2 14:43:56 2019 (r516330) +++ head/databases/mysqlwsrep56-server/files/patch-cmake_ssl.cmake Sat Nov 2 15:18:26 2019 (r516331) @@ -1,6 +1,6 @@ ---- cmake/ssl.cmake.orig 2017-01-25 07:58:07 UTC +--- cmake/ssl.cmake.orig 2019-10-21 05:17:49 UTC +++ cmake/ssl.cmake -@@ -176,7 +176,7 @@ MACRO (MYSQL_CHECK_SSL) +@@ -195,7 +195,7 @@ MACRO (MYSQL_CHECK_SSL) IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARY AND CRYPTO_LIBRARY AND Modified: head/databases/mysqlwsrep56-server/files/patch-extra_CMakeLists.txt ============================================================================== --- head/databases/mysqlwsrep56-server/files/patch-extra_CMakeLists.txt Sat Nov 2 14:43:56 2019 (r516330) +++ head/databases/mysqlwsrep56-server/files/patch-extra_CMakeLists.txt Sat Nov 2 15:18:26 2019 (r516331) @@ -1,6 +1,6 @@ ---- extra/CMakeLists.txt.orig 2019-07-16 14:08:43 UTC +--- extra/CMakeLists.txt.orig 2019-10-21 05:17:49 UTC +++ extra/CMakeLists.txt -@@ -101,8 +101,10 @@ IF(UNIX) +@@ -100,8 +100,10 @@ IF(UNIX) MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc) TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl) Modified: head/databases/mysqlwsrep56-server/files/patch-include_CMakeLists.txt ============================================================================== --- head/databases/mysqlwsrep56-server/files/patch-include_CMakeLists.txt Sat Nov 2 14:43:56 2019 (r516330) +++ head/databases/mysqlwsrep56-server/files/patch-include_CMakeLists.txt Sat Nov 2 15:18:26 2019 (r516331) @@ -1,6 +1,6 @@ ---- include/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC +--- include/CMakeLists.txt.orig 2019-10-21 05:17:49 UTC +++ include/CMakeLists.txt -@@ -65,10 +65,12 @@ SET(HEADERS +@@ -72,10 +72,12 @@ SET(HEADERS ${HEADERS_GEN_CONFIGURE} ) Modified: head/databases/mysqlwsrep56-server/files/patch-include_my__compare.h ============================================================================== --- head/databases/mysqlwsrep56-server/files/patch-include_my__compare.h Sat Nov 2 14:43:56 2019 (r516330) +++ head/databases/mysqlwsrep56-server/files/patch-include_my__compare.h Sat Nov 2 15:18:26 2019 (r516331) @@ -1,6 +1,6 @@ ---- include/my_compare.h.orig 2019-07-16 14:08:43 UTC +--- include/my_compare.h.orig 2019-10-21 05:17:49 UTC +++ include/my_compare.h -@@ -39,7 +39,7 @@ extern "C" { +@@ -46,7 +46,7 @@ extern "C" { But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. */ Modified: head/databases/mysqlwsrep56-server/files/patch-include_myisam.h ============================================================================== --- head/databases/mysqlwsrep56-server/files/patch-include_myisam.h Sat Nov 2 14:43:56 2019 (r516330) +++ head/databases/mysqlwsrep56-server/files/patch-include_myisam.h Sat Nov 2 15:18:26 2019 (r516331) @@ -1,6 +1,6 @@ ---- include/myisam.h.orig 2017-01-25 07:58:07 UTC +--- include/myisam.h.orig 2019-10-21 05:17:49 UTC +++ include/myisam.h -@@ -49,7 +49,7 @@ extern "C" { +@@ -56,7 +56,7 @@ extern "C" { The following defines can be increased if necessary. But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH. */ Modified: head/databases/mysqlwsrep56-server/files/patch-libmysql_CMakeLists.txt ============================================================================== --- head/databases/mysqlwsrep56-server/files/patch-libmysql_CMakeLists.txt Sat Nov 2 14:43:56 2019 (r516330) +++ head/databases/mysqlwsrep56-server/files/patch-libmysql_CMakeLists.txt Sat Nov 2 15:18:26 2019 (r516331) @@ -1,19 +1,19 @@ ---- libmysql/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC +--- libmysql/CMakeLists.txt.orig 2019-10-21 05:17:49 UTC +++ libmysql/CMakeLists.txt -@@ -180,7 +180,7 @@ IF(WIN32) +@@ -205,7 +205,7 @@ IF(WIN32) ENDIF() # Merge several convenience libraries into one big mysqlclient --MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) -+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL) +-MERGE_LIBRARIES(mysqlclient STATIC ${LIBS_TO_MERGE} COMPONENT Development) ++MERGE_LIBRARIES(mysqlclient STATIC ${LIBS_TO_MERGE} COMPONENT Development NOINSTALL) + TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK}) # Visual Studio users need debug static library for debug projects - IF(MSVC) -@@ -208,19 +208,22 @@ IF(UNIX) +@@ -234,19 +234,22 @@ IF(UNIX) ENDMACRO() ENDIF() -+IF(FALSE) ++IF (FALSE) IF(UNIX) GET_TARGET_NAME(mysqlclient lib_name) INSTALL_SYMLINK(mysqlclient @@ -25,15 +25,15 @@ IF(NOT DISABLE_SHARED) # Merge several convenience libraries into one big mysqlclient # and link them together into shared library. - MERGE_LIBRARIES(libmysql SHARED ${LIBS} + MERGE_LIBRARIES(libmysql SHARED ${LIBS_TO_MERGE} EXPORTS ${CLIENT_API_FUNCTIONS} - COMPONENT SharedLibraries) + COMPONENT SharedLibraries NOINSTALL) -+ IF(FALSE) ++ IF (FALSE) + TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK}) IF(UNIX) # libtool compatability - IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -289,4 +292,5 @@ IF(NOT DISABLE_SHARED) +@@ -316,4 +319,5 @@ IF(NOT DISABLE_SHARED) ${INSTALL_LIBDIR} SharedLibraries) ENDFOREACH() ENDIF() Modified: head/databases/mysqlwsrep56-server/files/patch-libservices_CMakeLists.txt ============================================================================== --- head/databases/mysqlwsrep56-server/files/patch-libservices_CMakeLists.txt Sat Nov 2 14:43:56 2019 (r516330) +++ head/databases/mysqlwsrep56-server/files/patch-libservices_CMakeLists.txt Sat Nov 2 15:18:26 2019 (r516331) @@ -1,6 +1,6 @@ ---- libservices/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC +--- libservices/CMakeLists.txt.orig 2019-10-21 05:17:49 UTC +++ libservices/CMakeLists.txt -@@ -24,4 +24,6 @@ SET(MYSQLSERVICES_SOURCES +@@ -31,4 +31,6 @@ SET(MYSQLSERVICES_SOURCES mysql_string_service.c) ADD_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) Modified: head/databases/mysqlwsrep56-server/files/patch-man_CMakeLists.txt ============================================================================== --- head/databases/mysqlwsrep56-server/files/patch-man_CMakeLists.txt Sat Nov 2 14:43:56 2019 (r516330) +++ head/databases/mysqlwsrep56-server/files/patch-man_CMakeLists.txt Sat Nov 2 15:18:26 2019 (r516331) @@ -1,6 +1,6 @@ ---- man/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC +--- man/CMakeLists.txt.orig 2019-10-21 05:17:49 UTC +++ man/CMakeLists.txt -@@ -14,9 +14,7 @@ +@@ -21,9 +21,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Copy man pages Modified: head/databases/mysqlwsrep56-server/files/patch-mysys__ssl_my__default.cc ============================================================================== --- head/databases/mysqlwsrep56-server/files/patch-mysys__ssl_my__default.cc Sat Nov 2 14:43:56 2019 (r516330) +++ head/databases/mysqlwsrep56-server/files/patch-mysys__ssl_my__default.cc Sat Nov 2 15:18:26 2019 (r516331) @@ -1,6 +1,6 @@ ---- mysys_ssl/my_default.cc.orig 2019-07-16 14:08:43 UTC +--- mysys_ssl/my_default.cc.orig 2019-10-21 05:17:49 UTC +++ mysys_ssl/my_default.cc -@@ -116,7 +116,7 @@ char wsrep_defaults_group_suffix[FN_EXTLEN]={0,}; +@@ -128,7 +128,7 @@ char wsrep_defaults_group_suffix[FN_EXTLEN]={0,}; #endif /* WITH_WREP */ /* Which directories are searched for options (and in which order) */ @@ -9,7 +9,7 @@ #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ static const char **default_directories = NULL; -@@ -921,6 +921,14 @@ static int search_default_file_with_ext(Process_option +@@ -933,6 +933,14 @@ static int search_default_file_with_ext(Process_option strncpy(wsrep_defaults_file, name, sizeof(wsrep_defaults_file) - 1); #endif /* WITH_WSREP */ @@ -24,7 +24,7 @@ while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file)) { line++; -@@ -1259,7 +1267,8 @@ void my_print_default_files(const char *conf_file) +@@ -1271,7 +1279,8 @@ void my_print_default_files(const char *conf_file) end[(strlen(end)-1)] = ' '; else strxmov(end, conf_file, *ext , " ", NullS); @@ -34,7 +34,7 @@ } } } -@@ -1418,14 +1427,9 @@ static const char **init_default_directories(MEM_ROOT +@@ -1430,14 +1439,9 @@ static const char **init_default_directories(MEM_ROOT #else @@ -51,7 +51,7 @@ #endif if ((env= getenv("MYSQL_HOME"))) -@@ -1495,7 +1499,7 @@ int check_file_permissions(const char *file_name, my_b +@@ -1507,7 +1511,7 @@ int check_file_permissions(const char *file_name, my_b MY_STAT stat_info; if (!my_stat(file_name,&stat_info,MYF(0))) Modified: head/databases/mysqlwsrep56-server/files/patch-plugin_password__validation_validate__password.cc ============================================================================== --- head/databases/mysqlwsrep56-server/files/patch-plugin_password__validation_validate__password.cc Sat Nov 2 14:43:56 2019 (r516330) +++ head/databases/mysqlwsrep56-server/files/patch-plugin_password__validation_validate__password.cc Sat Nov 2 15:18:26 2019 (r516331) @@ -1,6 +1,6 @@ ---- plugin/password_validation/validate_password.cc.orig 2019-07-16 14:08:43 UTC +--- plugin/password_validation/validate_password.cc.orig 2019-10-21 05:17:49 UTC +++ plugin/password_validation/validate_password.cc -@@ -16,6 +16,8 @@ +@@ -23,6 +23,8 @@ #include <my_sys.h> #include <string> #include <mysql/plugin_validate_password.h> Modified: head/databases/mysqlwsrep56-server/files/patch-scripts_CMakeLists.txt ============================================================================== --- head/databases/mysqlwsrep56-server/files/patch-scripts_CMakeLists.txt Sat Nov 2 14:43:56 2019 (r516330) +++ head/databases/mysqlwsrep56-server/files/patch-scripts_CMakeLists.txt Sat Nov 2 15:18:26 2019 (r516331) @@ -1,6 +1,6 @@ ---- scripts/CMakeLists.txt.orig 2019-07-16 14:08:43 UTC +--- scripts/CMakeLists.txt.orig 2019-10-21 05:17:49 UTC +++ scripts/CMakeLists.txt -@@ -304,6 +304,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) +@@ -311,6 +311,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) STRING(REGEX REPLACE "^lib" "" lib "${lib}") SET(${var} "${${var}}-l${lib} " ) @@ -9,7 +9,7 @@ ELSE() SET(${var} "${${var}}-l${lib} " ) ENDIF() -@@ -366,15 +368,10 @@ ELSE() +@@ -373,15 +375,10 @@ ELSE() # On Unix, most of the files end up in the bin directory SET(mysql_config_COMPONENT COMPONENT Development) SET(BIN_SCRIPTS @@ -25,7 +25,7 @@ mysqlhotcopy mysqldumpslow mysqld_multi -@@ -384,7 +381,7 @@ ELSE() +@@ -391,7 +388,7 @@ ELSE() FOREACH(file ${BIN_SCRIPTS}) IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh Modified: head/databases/mysqlwsrep56-server/files/patch-sql_CMakeLists.txt ============================================================================== --- head/databases/mysqlwsrep56-server/files/patch-sql_CMakeLists.txt Sat Nov 2 14:43:56 2019 (r516330) +++ head/databases/mysqlwsrep56-server/files/patch-sql_CMakeLists.txt Sat Nov 2 15:18:26 2019 (r516331) @@ -1,6 +1,6 @@ ---- sql/CMakeLists.txt.orig 2019-07-16 14:08:43 UTC +--- sql/CMakeLists.txt.orig 2019-10-21 05:17:49 UTC +++ sql/CMakeLists.txt -@@ -435,7 +435,7 @@ ADD_CUSTOM_TARGET( +@@ -442,7 +442,7 @@ ADD_CUSTOM_TARGET( DEPENDS ${GEN_DIGEST_SOURCES} ) @@ -9,7 +9,7 @@ MYSQL_ADD_PLUGIN(udf_example udf_example.cc MODULE_ONLY TEST_ONLY MODULE_OUTPUT_NAME "udf_example") IF(NOT DISABLE_SHARED) -@@ -445,6 +445,7 @@ IF(NOT DISABLE_SHARED) +@@ -452,6 +452,7 @@ IF(NOT DISABLE_SHARED) "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/udf_example.def") ENDIF() ENDIF() @@ -17,7 +17,7 @@ FOREACH(tool gtar tar git) STRING(TOUPPER ${tool} TOOL) -@@ -470,6 +471,7 @@ ADD_CUSTOM_TARGET(distclean +@@ -477,6 +478,7 @@ ADD_CUSTOM_TARGET(distclean IF(INSTALL_LAYOUT STREQUAL "STANDALONE") @@ -25,7 +25,7 @@ # Copy db.opt into data/test/ SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt ) INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles) -@@ -512,6 +514,7 @@ IF(WIN32 AND MYSQLD_EXECUTABLE) +@@ -519,6 +521,7 @@ IF(WIN32 AND MYSQLD_EXECUTABLE) ELSE() # Not windows or cross compiling, just install an empty directory INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles) Modified: head/databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc ============================================================================== --- head/databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc Sat Nov 2 14:43:56 2019 (r516330) +++ head/databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc Sat Nov 2 15:18:26 2019 (r516331) @@ -1,6 +1,6 @@ ---- sql/sys_vars.cc.orig 2019-07-16 14:08:43 UTC +--- sql/sys_vars.cc.orig 2019-10-21 05:17:49 UTC +++ sql/sys_vars.cc -@@ -1415,7 +1415,7 @@ static Sys_var_ulong Sys_interactive_timeout( +@@ -1422,7 +1422,7 @@ static Sys_var_ulong Sys_interactive_timeout( "connection before closing it", SESSION_VAR(net_interactive_timeout), CMD_LINE(REQUIRED_ARG), @@ -9,7 +9,7 @@ static Sys_var_ulong Sys_join_buffer_size( "join_buffer_size", -@@ -2034,7 +2034,7 @@ static Sys_var_ulong Sys_net_read_timeout( +@@ -2041,7 +2041,7 @@ static Sys_var_ulong Sys_net_read_timeout( "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)); -@@ -2049,7 +2049,7 @@ static Sys_var_ulong Sys_net_write_timeout( +@@ -2056,7 +2056,7 @@ static Sys_var_ulong Sys_net_write_timeout( "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)); -@@ -3182,7 +3182,7 @@ static Sys_var_ulong Sys_net_wait_timeout( +@@ -3189,7 +3189,7 @@ static Sys_var_ulong Sys_net_wait_timeout( "The number of seconds the server waits for activity on a " "connection before closing it", SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG), Modified: head/databases/mysqlwsrep56-server/files/patch-support-files_CMakeLists.txt ============================================================================== --- head/databases/mysqlwsrep56-server/files/patch-support-files_CMakeLists.txt Sat Nov 2 14:43:56 2019 (r516330) +++ head/databases/mysqlwsrep56-server/files/patch-support-files_CMakeLists.txt Sat Nov 2 15:18:26 2019 (r516331) @@ -1,6 +1,6 @@ ---- support-files/CMakeLists.txt.orig 2019-07-16 14:08:43 UTC +--- support-files/CMakeLists.txt.orig 2019-10-21 05:17:49 UTC +++ support-files/CMakeLists.txt -@@ -74,7 +74,9 @@ IF(UNIX) +@@ -81,7 +81,9 @@ IF(UNIX) INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) ENDIF()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911021518.xA2FIQuk088076>