diff options
Diffstat (limited to 'databases/mysqlwsrep57-server/files')
7 files changed, 69 insertions, 14 deletions
diff --git a/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt index f6924aeca2e1..cf1fa3717703 100644 --- a/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt +++ b/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2020-05-27 10:17:47 UTC +--- CMakeLists.txt.orig 2020-10-07 08:29:27 UTC +++ CMakeLists.txt -@@ -738,12 +738,10 @@ IF(UNIX) +@@ -739,12 +739,10 @@ IF(UNIX) ENDIF() IF(NOT WITHOUT_SERVER) @@ -13,7 +13,7 @@ ENDIF(WITH_EMBEDDED_SERVER) ENDIF() -@@ -752,8 +750,6 @@ ENDIF() +@@ -753,8 +751,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) -@@ -812,6 +808,7 @@ ENDIF() +@@ -813,6 +809,7 @@ ENDIF() # # RPM installs documentation directly from the source tree # @@ -30,7 +30,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES README -@@ -833,6 +830,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") +@@ -834,6 +831,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") PATTERN "mysql.info" EXCLUDE PATTERN "sp-imp-spec.txt" EXCLUDE ) diff --git a/databases/mysqlwsrep57-server/files/patch-cmake_os_FreeBSD.cmake b/databases/mysqlwsrep57-server/files/patch-cmake_os_FreeBSD.cmake index 64b809e3bd45..6778523e0797 100644 --- a/databases/mysqlwsrep57-server/files/patch-cmake_os_FreeBSD.cmake +++ b/databases/mysqlwsrep57-server/files/patch-cmake_os_FreeBSD.cmake @@ -1,6 +1,6 @@ ---- cmake/os/FreeBSD.cmake.orig 2018-10-04 05:48:22 UTC +--- cmake/os/FreeBSD.cmake.orig 2020-10-07 08:29:27 UTC +++ cmake/os/FreeBSD.cmake -@@ -30,6 +30,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER) +@@ -45,6 +45,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER) IF(NOT HAVE_SUPPORTED_CLANG_VERSION) MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!") ENDIF() @@ -21,7 +21,7 @@ ELSE() MESSAGE(FATAL_ERROR "Unsupported compiler!") ENDIF() -@@ -38,4 +52,6 @@ ENDIF() +@@ -53,4 +67,6 @@ ENDIF() # Should not be needed any more, but kept for easy resurrection if needed # #Legacy option, maybe not needed anymore , taken as is from autotools build # ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000) diff --git a/databases/mysqlwsrep57-server/files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc(working b/databases/mysqlwsrep57-server/files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc(working new file mode 100644 index 000000000000..267f774c1d8d --- /dev/null +++ b/databases/mysqlwsrep57-server/files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc(working @@ -0,0 +1,20 @@ +--- rapid/plugin/group_replication/src/recovery_state_transfer.cc.orig 2020-11-02 12:09:01 UTC ++++ rapid/plugin/group_replication/src/recovery_state_transfer.cc +@@ -711,6 +711,7 @@ int Recovery_state_transfer::purge_recovery_slave_thre + donor_connection_interface.initialize_channel(const_cast<char*>("<NULL>"), + 0, + NULL, NULL, ++ false, + NULL, + NULL, + NULL, +@@ -718,8 +719,7 @@ int Recovery_state_transfer::purge_recovery_slave_thre + NULL, + NULL, + NULL, +- NULL, +- NULL, ++ false, + DEFAULT_THREAD_PRIORITY, + 1, false); + diff --git a/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt index bb3ba6a598da..d76154ec725f 100644 --- a/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt +++ b/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt @@ -1,6 +1,6 @@ ---- scripts/CMakeLists.txt.orig 2020-05-27 10:17:47 UTC +--- scripts/CMakeLists.txt.orig 2020-10-07 08:29:27 UTC +++ scripts/CMakeLists.txt -@@ -336,6 +336,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) +@@ -330,6 +330,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() -@@ -421,14 +423,13 @@ ELSE() +@@ -415,14 +417,13 @@ ELSE() # On Unix, most of the files end up in the bin directory SET(mysql_config_COMPONENT COMPONENT Development) @@ -25,7 +25,7 @@ mysqldumpslow mysqld_multi mysqld_safe -@@ -472,7 +473,7 @@ ELSE() +@@ -466,7 +467,7 @@ ELSE() FOREACH(file ${BIN_SCRIPTS}) IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh diff --git a/databases/mysqlwsrep57-server/files/patch-sql_binlog.cc b/databases/mysqlwsrep57-server/files/patch-sql_binlog.cc new file mode 100644 index 000000000000..270179e31aa4 --- /dev/null +++ b/databases/mysqlwsrep57-server/files/patch-sql_binlog.cc @@ -0,0 +1,24 @@ +--- sql/binlog.cc.orig 2020-11-02 12:26:34 UTC ++++ sql/binlog.cc +@@ -10144,8 +10144,8 @@ void MYSQL_BIN_LOG::report_missing_purged_gtids(const + + char* missing_gtids= NULL; + char* slave_executed_gtids= NULL; +- gtid_missing.to_string(&missing_gtids, NULL); +- slave_executed_gtid_set->to_string(&slave_executed_gtids, NULL); ++ gtid_missing.to_string(&missing_gtids, false); ++ slave_executed_gtid_set->to_string(&slave_executed_gtids, false); + + /* + Log the information about the missing purged GTIDs to the error log +@@ -10216,8 +10216,8 @@ void MYSQL_BIN_LOG::report_missing_gtids(const Gtid_se + Gtid_set gtid_missing(slave_executed_gtid_set->get_sid_map()); + gtid_missing.add_gtid_set(slave_executed_gtid_set); + gtid_missing.remove_gtid_set(previous_gtid_set); +- gtid_missing.to_string(&missing_gtids, NULL); +- slave_executed_gtid_set->to_string(&slave_executed_gtids, NULL); ++ gtid_missing.to_string(&missing_gtids, false); ++ slave_executed_gtid_set->to_string(&slave_executed_gtids, false); + + String tmp_uuid; + uchar name[]= "slave_uuid"; diff --git a/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc b/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc index 82a0a869860d..0400ac649435 100644 --- a/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc +++ b/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc @@ -1,4 +1,4 @@ ---- sql/sys_vars.cc.orig 2019-10-21 05:21:41 UTC +--- sql/sys_vars.cc.orig 2020-10-07 08:29:27 UTC +++ sql/sys_vars.cc @@ -1748,7 +1748,7 @@ static Sys_var_ulong Sys_interactive_timeout( "connection before closing it", @@ -27,7 +27,7 @@ NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_net_write_timeout)); -@@ -4372,7 +4372,7 @@ static Sys_var_ulong Sys_net_wait_timeout( +@@ -4378,7 +4378,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), diff --git a/databases/mysqlwsrep57-server/files/patch-storage_innobase_fsp_fsp0fsp.cc b/databases/mysqlwsrep57-server/files/patch-storage_innobase_fsp_fsp0fsp.cc new file mode 100644 index 000000000000..05b88083b2b0 --- /dev/null +++ b/databases/mysqlwsrep57-server/files/patch-storage_innobase_fsp_fsp0fsp.cc @@ -0,0 +1,11 @@ +--- storage/innobase/fsp/fsp0fsp.cc.orig 2020-11-02 10:59:53 UTC ++++ storage/innobase/fsp/fsp0fsp.cc +@@ -1281,7 +1281,7 @@ fsp_header_decode_encryption_info( + + if (elen == MY_AES_BAD_DATA) { + my_free(master_key); +- return(NULL); ++ return(false); + } + + /* Check checksum bytes. */ |