git: 9fd5647e0711 - main - databases/mysql80-{client, server}: Update to latest release 8.0.33

From: Jochen Neumeister <joneum_at_FreeBSD.org>
Date: Sun, 09 Jul 2023 15:52:46 UTC
The branch main has been updated by joneum:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9fd5647e0711e28ba4b5702815103dc8eaeb11c7

commit 9fd5647e0711e28ba4b5702815103dc8eaeb11c7
Author:     Jochen Neumeister <joneum@FreeBSD.org>
AuthorDate: 2023-07-09 15:49:52 +0000
Commit:     Jochen Neumeister <joneum@FreeBSD.org>
CommitDate: 2023-07-09 15:52:13 +0000

    databases/mysql80-{client, server}: Update to latest release 8.0.33
    
    Bugs Fixed
    
        NDB Cluster: Occasional temporary errors which could occur when
    opening a table from the NDB dictionary while repeatedly performing
    concurrent schema operations were not retried. (Bug #34843889)
    
        NDB Cluster: During iteration, ordered index scans retain a cursor
    position within each concurrently scanned ordered index fragment.
    Ordered index fragments are modified and balanced as a result of
    committing DML transactions, which can require scan cursors to be moved
    within the tree. When running with query threads configured
    (AutomaticThreadConfig set to 1), multiple threads can access the same
    index fragment tree structure, and the scans of multiple threads can
    have their cursors present in the same structure.
    
        The current issue arose due to an assumption in the logic for moving
    scan cursors when committing DML operations that all scan cursors
    belonged to the LDM thread owning the index fragment, which did not
    allow for the possibility that such fragments might belong to query
    threads. (Bug #33379702)
    
        References: See also: Bug #32257063.
    
        InnoDB: Dead code removal. (Bug #35036850, Bug #109873)
    
        InnoDB: Error messages related to innodb_doublewrite moved to the
    error log. (Bug #34883045, Bug #109330)
    
        InnoDB: Prevent online DDL operations from accessing out-of-bounds
    memory. (Bug #34750489, Bug #108925)
    
        InnoDB: ALTER TABLE ... AUTO_INCREMENT could be set to less than MAX
    + 1 and not forced to MAX + 1. (Bug #33419246, Bug #105092)
    
        InnoDB: Innodb_data_pending_fsyncs could show extremely high
    inaccurate values because of a variable overflow. (Bug #30133150)
    
        Partitioning: Some IN() queries on partitioned tables were not
    always handled correctly. (Bug #34801284)
    
        References: This issue is a regression of: Bug #32311183.
    
        Partitioning: Queries using the INDEX_MERGE optimizer hint was not
    handled correctly in all cases. (Bug #34797257)
    
        Replication: XA transactions whose XIDs contained null bytes could
    not be recovered. (Bug #34918985)
    
        Replication: When binlog_order_commits was set equal to 1, for any
    two transactions and for any sub-step of the commit phase, the
    transaction that was written to the binary log first did not always
    execute the sub-step first, as expected. (Bug #34703698)
    
        Replication: Some binary log events were not always handled
    correctly. (Bug #34617506)
    
        Replication: The binary log recovery process did not report all
    possible error states. (Bug #33658850)
    
        Replication: Following CHANGE REPLICATION SOURCE TO
    SOURCE_CONNECTION_AUTO_FAILOVER=1, failover generated a number of
    misleading warnings in the log that implied there were problems when in
    fact conditions were those expected for such a failover. These log
    messages have been updated accordingly. (Bug #32135376)
    
        Replication: When a transaction failed, as a side effect, extraneous
    error messages relating the replication data repositories were written
    to the log. Now in such cases, we suppress such error messages, which
    are not directly related to the issue of the failed transaction or its
    cause. (Bug #19820134)
    
        Replication: Setting binlog_order_commits to OFF could lead to a
    missed GTID in the next binary log file's Previous_gtids event.
    
        Our thanks to Yewei Xu and the Tencent team for the contribution.
    (Bug #109485, Bug #34930969)
    
        Replication: Corrected the SQL statements suggested in the error
    message text for ER_RPL_REPLICA_ERROR_RUNNING_QUERY.
    
        Our thanks to Dan McCombs for the contribution. (Bug #109154, Bug
    
        Replication: A hash scan builds a hash of changes, scans the target
    table or index, and applies any matching change for the current entry.
    In the build phase, it uses only the before image, and skips any after
    image. Problems arose in some cases because generated columns were
    computed for the (skipped) after image, leading to replication errors.
    This is fixed by not computing generated columns any longer for
    seek-only calls such as hash scans.
    
        Our thanks to dc huang for the contribution. (Bug #107366, Bug
    
        Replication: In certain rare cases, it was possible to set
    gtid_mode=OFF for one session while another session, after
    WAIT_FOR_EXECUTED_GTID_SET() was issued by a user in this second
    session, was still waiting for the next GTID set from the first session.
    This could result in the second session waiting indefinitely for the
    function to return. (Bug #99921, Bug #31505993)
    
        Group Replication: Accessing the Performance Schema
    replication_group_communication_information and
    replication_group_member_stats tables in parallel sometimes caused
    subsequent group replication operations to hang. (Bug #34870181)
    
        Group Replication: In certain cases, the group replication secondary
    node unexpectedly shut down while purging the relay log. (Bug #34397106)
    
        Group Replication: When shutting down the Group Replication plugin,
    the order in which the associated events were reported the error log
    sometimes led to confusion. To remove any doubts, we now make sure that
    Plugin group_replication reported: 'Plugin 'group_replication' has been
    stopped. is in fact the last log message relating to the shutdown,
    written only when all other events associated with shutting down the
    plugin have been logged. (Bug #109345, Bug #34887491)
    
        Microsoft Windows: The authentication_fido_client plugin stopped
    responding during the authentication process if it was unable to find a
    FIDO device on the Windows client host. (Bug #34918044)
    
        In certain cases, CONVERT(utf8mb3_column USING UTF16) was rejected
    with the error Cannot convert string '\x--...' from binary to utf16.
    (Bug #35129361)
    
        When joining two tables on a string column, and the column from one
    of the tables has an additional predicate comparing it with a temporal
    literal, constant propagation in some cases incorrectly caused the join
    condition to be modified such that it used temporal rather than string
    semantics when comparing the strings. This caused incorrect results to
    be returned from the join. (Bug #35115909)
    
        Error messages returned after calling the mysql_reset_connection() C
    API function in a prepared statement did not identify the function name
    properly. (Bug #35107280)
    
        Fixed a regression in a previous fix for an issue with windowing
    functions.
    
        Our thanks to Dmitry Lenev for the contribution. (Bug #35061924)
    
        References: This issue is a regression of: Bug #34572136.
    
        When replacing subqueries in transforms, the internal flag showing
    whether a given query block contains any subqueries (PROP_SUBQUERY) was
    not updated afterwards. (Bug #35060385)
    
        A client setting the character set to an impermissible client
    character set (ucs2, utf16, utf16le, or utf32) could cause unexpected
    behavior when the client used an authentication plugin. (Bug #35054579)
    
    Changelog:
    https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-33.html
    
    Sponsored by:   Netzkommune GmbH
---
 databases/mysql80-client/pkg-plist                 | 32 ++++++++---------
 databases/mysql80-server/Makefile                  |  7 ++--
 databases/mysql80-server/distinfo                  |  6 ++--
 ...-router_src_harness_src_tls__server__context.cc | 13 +++----
 .../files/patch-utilities_CMakeLists.txt           | 16 ++++-----
 databases/mysql80-server/pkg-plist                 | 40 ++++++++++++----------
 6 files changed, 58 insertions(+), 56 deletions(-)

diff --git a/databases/mysql80-client/pkg-plist b/databases/mysql80-client/pkg-plist
index b185afa48caf..012af31d33c0 100644
--- a/databases/mysql80-client/pkg-plist
+++ b/databases/mysql80-client/pkg-plist
@@ -39,20 +39,20 @@ lib/mysql/libmysqlclient_r.so.21
 lib/mysql/plugin/authentication_fido_client.so
 lib/mysql/plugin/authentication_oci_client.so
 libdata/pkgconfig/mysqlclient.pc
-share/man/man1/comp_err.1.gz
-share/man/man1/lz4_decompress.1.gz
-share/man/man1/mysql.1.gz
-share/man/man1/mysql_config.1.gz
-share/man/man1/mysql_config_editor.1.gz
-share/man/man1/mysqladmin.1.gz
-share/man/man1/mysqlbinlog.1.gz
-share/man/man1/mysqlcheck.1.gz
-share/man/man1/mysqldump.1.gz
-share/man/man1/mysqlimport.1.gz
-share/man/man1/mysqlman.1.gz
-share/man/man1/mysqlpump.1.gz
-share/man/man1/mysqlshow.1.gz
-share/man/man1/mysqlslap.1.gz
-share/man/man1/perror.1.gz
-share/man/man1/zlib_decompress.1.gz
+@comment share/man/man1/comp_err.1.gz
+@comment share/man/man1/lz4_decompress.1.gz
+@comment share/man/man1/mysql.1.gz
+@comment share/man/man1/mysql_config.1.gz
+@comment share/man/man1/mysql_config_editor.1.gz
+@comment share/man/man1/mysqladmin.1.gz
+@comment share/man/man1/mysqlbinlog.1.gz
+@comment share/man/man1/mysqlcheck.1.gz
+@comment share/man/man1/mysqldump.1.gz
+@comment share/man/man1/mysqlimport.1.gz
+@comment share/man/man1/mysqlman.1.gz
+@comment share/man/man1/mysqlpump.1.gz
+@comment share/man/man1/mysqlshow.1.gz
+@comment share/man/man1/mysqlslap.1.gz
+@comment share/man/man1/perror.1.gz
+@comment share/man/man1/zlib_decompress.1.gz
 share/aclocal/mysql.m4
diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile
index 1d5156b365ef..23edec7d6463 100644
--- a/databases/mysql80-server/Makefile
+++ b/databases/mysql80-server/Makefile
@@ -1,6 +1,6 @@
 PORTNAME?=		mysql
-PORTVERSION=		8.0.32
-PORTREVISION?=		3
+PORTVERSION=		8.0.33
+PORTREVISION?=		0
 CATEGORIES=		databases
 MASTER_SITES=		MYSQL/MySQL-8.0
 PKGNAMESUFFIX?=		80-server
@@ -31,7 +31,6 @@ LIB_DEPENDS+=	libcurl.so:ftp/curl \
 		libevent.so:devel/libevent \
 		libicutu.so:devel/icu \
 		liblz4.so:archivers/liblz4 \
-		libzstd.so:archivers/zstd \
 		libfido2.so:security/libfido2 \
 		libhidapi.so:comms/hidapi \
 		${LIB_DEPENDS_${ARCH}}
@@ -85,7 +84,7 @@ CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
 		-DWITH_LZ4=system \
 		-DWITH_ICU=system \
 		-DWITH_CURL=system \
-		-DWITH_ZSTD=system \
+		-DWITH_ZSTD=bundled \
 		-DWITH_PROTOBUF=bundled \
 		-DWITH_SSL=system \
 		-DWITH_AUTHENTICATION_FIDO=1 \
diff --git a/databases/mysql80-server/distinfo b/databases/mysql80-server/distinfo
index 8134c31693a6..05b98badd3de 100644
--- a/databases/mysql80-server/distinfo
+++ b/databases/mysql80-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1676165343
-SHA256 (mysql-boost-8.0.32.tar.gz) = 1a83a2e1712a2d20b80369c45cecbfcc7be9178d4fc0e81ffba5c273ce947389
-SIZE (mysql-boost-8.0.32.tar.gz) = 436207624
+TIMESTAMP = 1686677589
+SHA256 (mysql-boost-8.0.33.tar.gz) = ae31e6368617776b43c82436c3736900067fada1289032f3ac3392f7380bcb58
+SIZE (mysql-boost-8.0.33.tar.gz) = 438065679
diff --git a/databases/mysql80-server/files/patch-router_src_harness_src_tls__server__context.cc b/databases/mysql80-server/files/patch-router_src_harness_src_tls__server__context.cc
index 267814803231..72866c631fd2 100644
--- a/databases/mysql80-server/files/patch-router_src_harness_src_tls__server__context.cc
+++ b/databases/mysql80-server/files/patch-router_src_harness_src_tls__server__context.cc
@@ -1,12 +1,13 @@
---- router/src/harness/src/tls_server_context.cc.orig	2022-12-11 13:24:16 UTC
-+++ router/src/harness/src/tls_server_context.cc
-@@ -272,7 +272,8 @@ stdx::expected<void, std::error_code> set_auto_dh_para
+--- router/src/harness/src/tls_server_context.cc.orig	2023-06-29 15:05:27.686865000 +0200
++++ router/src/harness/src/tls_server_context.cc	2023-06-29 15:31:25.869049000 +0200
+@@ -275,7 +275,9 @@ stdx::expected<void, std::error_code> set_auto_dh_para
  #if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(3, 0, 0)
    SSL_CTX_set_dh_auto(ssl_ctx, 1);
  #else
 -#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0)
 +#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0) \
 +  && !defined(LIBRESSL_VERSION_NUMBER)
-   OsslUniquePtr<DH> dh_storage(DH_get_2048_256());
- #else
-   /*
++
+   int sec_level = SSL_CTX_get_security_level(ssl_ctx);
+ 
+   assert(sec_level <= kMaxSecurityLevel);
diff --git a/databases/mysql80-server/files/patch-utilities_CMakeLists.txt b/databases/mysql80-server/files/patch-utilities_CMakeLists.txt
index 29c120a41e79..c68cd6aa532d 100644
--- a/databases/mysql80-server/files/patch-utilities_CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-utilities_CMakeLists.txt
@@ -1,8 +1,8 @@
---- utilities/CMakeLists.txt.orig	2020-09-23 12:37:48 UTC
-+++ utilities/CMakeLists.txt
-@@ -23,13 +23,19 @@
- ADD_WSHADOW_WARNING()
+--- utilities/CMakeLists.txt.orig	2023-06-14 08:24:40.103026000 +0200
++++ utilities/CMakeLists.txt	2023-06-22 20:43:33.353592000 +0200
+@@ -24,13 +24,19 @@ MSVC_CPPCHECK_DISABLE()
  DISABLE_MISSING_PROFILE_WARNING()
+ MSVC_CPPCHECK_DISABLE()
  
 -IF(NOT CMAKE_CROSSCOMPILING)
 +IF(WITHOUT_CLIENTLIBS)
@@ -22,7 +22,7 @@
  
  MYSQL_ADD_EXECUTABLE(comp_client_err
    comp_client_err.cc
-@@ -112,10 +118,30 @@ MYSQL_ADD_EXECUTABLE(static_thread_local_test
+@@ -113,10 +119,30 @@ MYSQL_ADD_EXECUTABLE(static_thread_local_test
    EXCLUDE_FROM_ALL
    )
  
@@ -53,8 +53,8 @@
    )
  MYSQL_ADD_EXECUTABLE(perror
    perror.cc
-@@ -130,12 +156,23 @@ IF(BUILD_BUNDLED_LZ4)
-     LINK_LIBRARIES ${LZ4_LIBRARY} mysys
+@@ -131,12 +157,23 @@ ENDIF()
+     LINK_LIBRARIES ext::lz4 mysys
      )
  ENDIF()
 +ENDIF(WITHOUT_CLIENTLIBS)
@@ -63,7 +63,7 @@
  MYSQL_ADD_EXECUTABLE(zlib_decompress
    zlib_decompress.cc
    COMPONENT Server
-   LINK_LIBRARIES ${ZLIB_LIBRARY} mysys
+   LINK_LIBRARIES ext::zlib mysys
 +    SKIP_INSTALL )
 +ELSE(WITHOUT_CLIENTLIBS)
 +IF(BUILD_BUNDLED_ZLIB OR NOT OPENSSL_EXECUTABLE_HAS_ZLIB)
diff --git a/databases/mysql80-server/pkg-plist b/databases/mysql80-server/pkg-plist
index 15aa026bbb80..f9dbff562f49 100644
--- a/databases/mysql80-server/pkg-plist
+++ b/databases/mysql80-server/pkg-plist
@@ -87,9 +87,11 @@ lib/mysql/plugin/component_test_mysql_command_services.so
 lib/mysql/plugin/component_test_mysql_current_thread_reader.so
 lib/mysql/plugin/component_test_mysql_runtime_error.so
 lib/mysql/plugin/component_test_mysql_system_variable_set.so
+lib/mysql/plugin/component_test_mysql_thd_store_service.so
 lib/mysql/plugin/component_test_pfs_notification.so
 lib/mysql/plugin/component_test_pfs_resource_group.so
 lib/mysql/plugin/component_test_sensitive_system_variables.so
+lib/mysql/plugin/component_test_server_telemetry_traces.so
 lib/mysql/plugin/component_test_status_var_reader.so
 lib/mysql/plugin/component_test_status_var_service.so
 lib/mysql/plugin/component_test_status_var_service_int.so
@@ -179,25 +181,25 @@ lib/mysql/private/libprotobuf-lite.so.3.19.4
 lib/mysql/private/libprotobuf.so.3.19.4
 lib/mysql/libprotobuf-lite.so.3.19.4
 libexec/mysqld
-share/man/man1/ibd2sdi.1.gz
-share/man/man1/innochecksum.1.gz
-share/man/man1/my_print_defaults.1.gz
-share/man/man1/myisam_ftdump.1.gz
-share/man/man1/myisamchk.1.gz
-share/man/man1/myisamlog.1.gz
-share/man/man1/myisampack.1.gz
-share/man/man1/mysql_secure_installation.1.gz
-share/man/man1/mysql_ssl_rsa_setup.1.gz
-share/man/man1/mysql_tzinfo_to_sql.1.gz
-share/man/man1/mysql_upgrade.1.gz
-share/man/man1/mysql.server.1.gz
-share/man/man1/mysqld_multi.1.gz
-share/man/man1/mysqld_safe.1.gz
-share/man/man1/mysqldumpslow.1.gz
-share/man/man1/mysqlrouter_passwd.1.gz
-share/man/man1/mysqlrouter_plugin_info.1.gz
-share/man/man1/mysqlrouter.1.gz
-share/man/man8/mysqld.8.gz
+@comment share/man/man1/ibd2sdi.1.gz
+@comment share/man/man1/innochecksum.1.gz
+@comment share/man/man1/my_print_defaults.1.gz
+@comment share/man/man1/myisam_ftdump.1.gz
+@comment share/man/man1/myisamchk.1.gz
+@comment share/man/man1/myisamlog.1.gz
+@comment share/man/man1/myisampack.1.gz
+@comment share/man/man1/mysql_secure_installation.1.gz
+@comment share/man/man1/mysql_ssl_rsa_setup.1.gz
+@comment share/man/man1/mysql_tzinfo_to_sql.1.gz
+@comment share/man/man1/mysql_upgrade.1.gz
+@comment share/man/man1/mysql.server.1.gz
+@comment share/man/man1/mysqld_multi.1.gz
+@comment share/man/man1/mysqld_safe.1.gz
+@comment share/man/man1/mysqldumpslow.1.gz
+@comment share/man/man1/mysqlrouter_passwd.1.gz
+@comment share/man/man1/mysqlrouter_plugin_info.1.gz
+@comment share/man/man1/mysqlrouter.1.gz
+@comment share/man/man8/mysqld.8.gz
 %%DATADIR%%/bulgarian/errmsg.sys
 %%DATADIR%%/charsets/Index.xml
 %%DATADIR%%/charsets/README