Attachment 219362 Details for Bug 250508 – Update to 5.7.31-25.23

[patch] Update to 5.7.31-25.23

mysqlwsrep57-server-5.7.31-25.23.patch (text/plain), 10.43 KB, created by devel on 2020-11-04 20:21:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: devel

Created: 2020-11-04 20:21:22 UTC

Size: 10.43 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 553896)
>+++ Makefile	(working copy)
>@@ -2,9 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	mysqlwsrep
>-PORTVERSION?=	5.7.30
>+PORTVERSION?=	5.7.31
> DISTVERSIONPREFIX?=	wsrep_
>-DISTVERSIONSUFFIX?=	-25.22
>+DISTVERSIONSUFFIX?=	-25.23
> PORTREVISION?=	0
> CATEGORIES=	databases
> MASTER_SITES+=	SF/boost/boost/1.59.0:boost
>@@ -99,6 +99,7 @@
> USERS=		mysql
> GROUPS=		mysql
> 
>+USE_CXXSTD=     c++11
> USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
> 
> MMAN1=		my_print_defaults.1 \
>@@ -185,6 +186,12 @@
> .  endif
> .endif
> 
>+# Plugin innodb_memcached requires -fcommon to avoid duplicate symbol linker
>+# error with llmv11.
>+.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300109
>+CFLAGS+=	-fcommon
>+.endif
>+
> post-extract:
> 	${RM} -fv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 553896)
>+++ distinfo	(working copy)
>@@ -1,7 +1,7 @@
>-TIMESTAMP = 1591201597
>+TIMESTAMP = 1603213079
> SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
> SIZE (boost_1_59_0.tar.gz) = 83709983
>-SHA256 (codership-mysql-wsrep-wsrep_5.7.30-25.22_GH0.tar.gz) = 2fb00a0b6f644b1f37bdc2cdbee5f090fbc0377e66b06dbe1971943097a35658
>-SIZE (codership-mysql-wsrep-wsrep_5.7.30-25.22_GH0.tar.gz) = 54733023
>+SHA256 (codership-mysql-wsrep-wsrep_5.7.31-25.23_GH0.tar.gz) = 1a66f94778a37ce909e92e35eb3e5adb961708f105fe67281062185b93ab1945
>+SIZE (codership-mysql-wsrep-wsrep_5.7.31-25.23_GH0.tar.gz) = 54754887
> SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0
> SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032
>Index: files/patch-CMakeLists.txt
>===================================================================
>--- files/patch-CMakeLists.txt	(revision 553896)
>+++ files/patch-CMakeLists.txt	(working copy)
>@@ -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
>    )
>Index: files/patch-cmake_os_FreeBSD.cmake
>===================================================================
>--- files/patch-cmake_os_FreeBSD.cmake	(revision 553896)
>+++ files/patch-cmake_os_FreeBSD.cmake	(working copy)
>@@ -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)
>Index: files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc
>===================================================================
>--- files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc(nonexistent)
>+++ files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc(working copy)
>@@ -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);
>+ 
>
>Property changes on: files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-scripts_CMakeLists.txt
>===================================================================
>--- files/patch-scripts_CMakeLists.txt	(revision 553896)
>+++ files/patch-scripts_CMakeLists.txt	(working copy)
>@@ -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
>Index: files/patch-sql_binlog.cc
>===================================================================
>--- files/patch-sql_binlog.cc	(nonexistent)
>+++ files/patch-sql_binlog.cc	(working copy)
>@@ -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";
>
>Property changes on: files/patch-sql_binlog.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-sql_sys__vars.cc
>===================================================================
>--- files/patch-sql_sys__vars.cc	(revision 553896)
>+++ files/patch-sql_sys__vars.cc	(working copy)
>@@ -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),
>Index: files/patch-storage_innobase_fsp_fsp0fsp.cc
>===================================================================
>--- files/patch-storage_innobase_fsp_fsp0fsp.cc	(nonexistent)
>+++ files/patch-storage_innobase_fsp_fsp0fsp.cc	(working copy)
>@@ -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. */
>
>Property changes on: files/patch-storage_innobase_fsp_fsp0fsp.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>

Flags:

devel: maintainer-approval+

Actions: View | Diff

Attachments on bug 250508: 218947 | 219362