CVS commit: pkgsrc/databases

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue May 23 21:01:12 UTC 2023

Modified Files:
        pkgsrc/databases/mysql80-client: Makefile Makefile.common PLIST
            buildlink3.mk distinfo
        pkgsrc/databases/mysql80-client/patches: patch-CMakeLists.txt
            patch-libmysql_CMakeLists.txt
        pkgsrc/databases/mysql80-server: Makefile PLIST buildlink3.mk
Added Files:
        pkgsrc/databases/mysql80-client/patches: patch-cmake_pkg-config.cmake
            patch-cmake_zlib.cmake patch-utilities_CMakeLists.txt

Log Message:
mysql80: updated to 8.0.33

8.0.33

Functionality Added or Changed

Important Change: For platforms on which OpenSSL libraries are bundled, the linked OpenSSL library for MySQL Server has been updated to version 1.1.1t. Issues fixed in OpenSSL version 1.1.1t are 
described at https://www.openssl.org/news/cl111.txt.

Replication: As part of ongoing work to change old terminology used in MySQL products, the terms “master”, “slave”, and “MTS” have been replaced in error messages relating to MySQL Replication by 
“source”, “replica”, and “MTA”, respectively. This includes all error messages listed in messages_to_clients.txt and messages_to_error_log.txt relating to replication; the present task does not 
perform this replacement for messages used in other contexts.

See the MySQL 8.0 Error Message Reference, for more information.

Replication: mysqlbinlog --start-position now accepts values up to 18446744073709551615, unless the --read-from-remote-server or --read-from-remote-source option is also used, in which case the 
maximum is 4294967295.

Binary packages that include curl rather than linking to the system curl library have been upgraded to use curl 7.88.1.

The use of a generated column with DEFAULT(col_name) to specify the default value for a named column is not permitted and now emits an error message.

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.

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.

InnoDB: Dead code removal.

InnoDB: Error messages related to innodb_doublewrite moved to the error log.

InnoDB: Prevent online DDL operations from accessing out-of-bounds memory.

InnoDB: ALTER TABLE ... AUTO_INCREMENT could be set to less than MAX + 1 and not forced to MAX + 1.

InnoDB: Innodb_data_pending_fsyncs could show extremely high inaccurate values because of a variable overflow.

Partitioning: Some IN() queries on partitioned tables were not always handled correctly.

Partitioning: Queries using the INDEX_MERGE optimizer hint was not handled correctly in all cases.

Replication: XA transactions whose XIDs contained null bytes could not be recovered.

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.

Replication: The binary log recovery process did not report all possible error states.

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.

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.

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.

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.

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.

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.

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.

Group Replication: In certain cases, the group replication secondary node unexpectedly shut down while purging the relay log.

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.

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.

In certain cases, CONVERT(utf8mb3_column USING UTF16) was rejected with the error Cannot convert string '\x--...' from binary to utf16.

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.

Error messages returned after calling the mysql_reset_connection() C API function in a prepared statement did not identify the function name properly.

Fixed a regression in a previous fix for an issue with windowing functions.

Our thanks to Dmitry Lenev for the contribution.

When replacing subqueries in transforms, the internal flag showing whether a given query block contains any subqueries (PROP_SUBQUERY) was not updated afterwards.

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.

EXPLAIN ANALYZE displayed 0 when the average number of rows was less than 1. To fix this, we now format numbers in the output of EXPLAIN ANALYZE and EXPLAIN FORMAT=TREE such that numbers in the range 
0.001-999999.5 are printed as decimal numbers, and numbers outside this range are printed using engineering notation (for example: 1.23e+9, 934e-6). In addition, trailing zeroes are no longer 
printed, and numbers less than 1e-12 are printed as 0.

This helps ensure consistent precision regardless of the number's value and improve readability, while producing minimal rounding errors.

The NTILE() function did not work correctly in all cases.

Some joins on views did not perform correctly.

Transforming a correlated scalar subquery to a derived table led to a wrong result for InnoDB tables when the subquery included duplicate predicates. An example of a query which could be affected by 
this issue is shown here:

SELECT * FROM t1
WHERE (
  SELECT t2.a FROM t2
  WHERE t2.a = t1.a AND t2.a = t1.a
    ) > 0;

Fixed an assert in sql/item_strfunc.cc that could potentially lead to issues with the SPACE() function.

Using ROW_COUNT() as the length argument to LPAD() or RPAD() did not perform as expected.

A query with a window function having an expression with a CASE function in its ORDER BY clause could lead to a server exit.

The fix for a previous issue introduced an assertion in debug builds when optimizing a HAVING clause.

When using mysqld_multi, the system that obscures "--password" usage as "--password=*****" would also match "--password-history" and "--password-require-current" definitions as "--password", but now 
explicitly checks for "--password=" instead.

In some cases, calling the mysql_bind_param() C API function could cause the server to become unresponsive.

The authentication_oci_client plugin was unable to open a valid configuration file if any of its entries contained an equals sign character separated by spaces (for example, key_file = 
/home/user/.oci/oci_api_key.pem). Now, both 'key=value' and 'key = value' entry formats are supported.

Incorrect results were returned when the result of an INTERSECT or EXCEPT operation was joined with another table. This issue affected these operations in such cases when used with either DISTINCT or 
ALL.

When preparing a view query, the operation used the system character set (instead of the character set stored in data dictionary) and then reported an invalid character-string error.

Prepared statements that operate on derived tables, including views, could stop unexpectedly due to problems with the code for reopening tables after an error.

Removed an assertion raised in certain cases by the RANDOM_BYTES() function in debug builds.

There was an issue in how persisted variables were set on startup, causing certain variables not to get properly set to their persisted value.

The MAKETIME() function did not perform correctly in all cases.

Some functions with multiple arguments did not produce the expected results.

A table reference in an ORDER BY outside the parenthesized query block in which the table was used, and which query block had no LIMIT or ORDER BY of its own, raised an error.

A left join with an impossible condition as part of an ON clause was not optimized as in MySQL 5.7, so that in MySQL 8.0, the query executed more quickly without the impossible condition than with 
it. An example of such a query, impossible condition included, is SELECT * FROM t1 JOIN t2 ON t1.c1=t2.c1 AND 1=2.

When a user defined function was part of a derived table that was merged into the outer query block, or was part of a subquery converted to a semi-join, knowledge of whether this UDF was 
deterministic (or not) was lost during processing.

With JSON logging enabled and an event subclass specified in the audit log filter definition, an empty item ("" : { }) was appended to the end of the logged event.

Some subqueries did not execute properly.

After the asymmetric_encrypt() component function in a SELECT query encountered a NULL field to decrypt, it could return NULL values for other non-NULL encrypted fields.

The server did not always shut down cleanly after uninstalling the audit log plugin.

Certain antijoins were not handled correctly by the server.

When the MySQL 5.7 Optimizer has 2 choices for an index to filter rows, one primary and one secondary, it picks a range scan on the secondary index because the range scan uses more key parts. MySQL 
8.0 did not use this logic, instead choosing the primary index to filter rows with WHERE clause filtering. Primary key use is not suitable in such cases due to the presence of LIMIT, and due to the 
nature of data distribution. The secondary index was not considered while resolving order by due to constant elimination. This resulted in much different query plans in MySQL 5.7 and MySQL 8.0 for 
the same query.

We solve this issue in MySQL 8.0 by skipping the constant key parts of the index during order-by evaluation only if the query is constant-optimized, which can be done at this time, but not during 
LIMIT analysis.

The MySQL data dictionary caches failed lookups of se_private_id values (IDs which are not found), which speeds up execution of code specific to InnoDB, relying on the fact that InnoDB does not reuse 
these IDs. This assumption does not necessarily hold for other storage engines, most notably NDB, where this problem was resolved previously by not using this cache.

We extend the previous fix made for NDB so that the cache lookup is now employed only when the table uses the InnoDB storage engine.

Unexpected results were seen in some queries using DENSE_RANK(), possibly with the addition of WITH ROLLUP.

Fixed an assert raised in sql/sql_tmp_table.cc following work done previously to reimplement ROLLUP processing.

Some CTEs that did not use any tables were not always handled correctly.

Accessing rows from a window frame of a window function call present only in the query's ORDER BY list raised an error.

PERCENT_RANK() used with ORDER BY column did not return the correct result.

The --exclude-tables and --include-tables mysqlpump options did not handle views.

Changed the MySQL systemd service unit configuration from After=network-online.target to Wants=network-online.target to ensure that all configured network devices are available and have an IP address 
assigned before the service is started.

AVG(...) OVER (ROWS BETWEEN 1 FOLLOWING AND UNBOUNDED FOLLOWING) did not return the correct result.

A query of the form SELECT 1 FROM t1 WHERE NOT EXISTS (VALUES ROW(1), ROW(2)) caused an assert in debug builds when the subquery_to_derived optimizer switch was enabled.

mysqlimport did not escape reserved word table names when used with the --delete option.

When cloning a condition to push down to a derived table, characters in strings representing conditions were converted to utfmb4 correctly only for values less than 128 (the ASCII subset), and code 
points outside the ASCII subset were converted to invalid characters, causing the resulting character strings to become invalid. For derived tables without UNION, this led to problems when a column 
name from the derived table used characters outside the ASCII subset, and was used in the WHERE condition. For derived tables with UNION, it created problems when a character outside the ASCII subset 
was present in a WHERE condition.

We fix these issues by initializing the string used for representing the condition in such cases to the connection character set.

Using --single-transaction with mysqldump version 8.0.32 required either the RELOAD or FLUSH_TABLES privilege. This requirement now applies only when both gtid_mode=ON (default OFF) and with 
--set-gtid-purged = ON|AUTO (default AUTO).

Fixed a number of issues present in the internal documentation for the scramble generator algorithm in sha256_scramble_generator.cc and sha2_password_common.cc.

Our thanks to Niklas Keller for the contribution.

CREATE USER IF NOT EXISTS added a password history entry even when the user already existed and the password was not updated. This caused a subsequent ALTER USER statement to be rejected.

Many joins using eq_ref access did not perform as well as in previous versions. This issue was first reported in MySQL 8.0.29.

A hash outer join sometimes incorrectly matched NULL with a decimal zero or an empty string that used a non-padding collation, leading to erroneous results.

An object used internally by ALTER INSTANCE RELOAD TLS was not freed until the number of readers reached 0, under the assumption is that the number of readers should reach 0 fairly frequently. The 
read lock held during an SSL handshake is generally an expensive operation, with network calls, so when roundtrips between the client and the server took excessively long, the lock was held for a 
relatively long amount of time. This meant that, when changing the value of this object and there were a sufficient number of incoming SSL connections being made, the number of readers might not 
reach 0 in a reasonable length of time, leaving the thread holding the lock using 100% of the CPU until the lock was released.

We fix this by adding a wait after setting the pointer to this object to a new value, but before releasing the old object.

Our thanks to Sinisa Milivojevic for the contribution.

If mysqldump or mysqlpump could not convert a field's default value to UTF-8 (for instance, if the field was of type BINARY and the default value did not coincide with valid UTF-8), the operation 
produced results that were not valid to import. Further, using the --hex-blob option did not resolve the issue. We now convert the default value to the system character set. If this fails, the server 
sends the value as hexadecimal instead to make it more human-readable.

A connection using the C API (libmysqlclient) client library could fail with the FUTURE crypto policy.

While cloning a temporary table for a common table expression which used shared materialization, the cloned temp table was not marked as using hash deduplication, leading to wrong results. We now set 
the hash field for the cloned temporary table correctly, and update the hidden field count to take this into account.

CREATE EVENT and ALTER EVENT assumed that all values passed to them (other than in a DO clause) resolved as scalars without actually checking the values. This led to assertions when any such values 
actually rows.

We now perform an explicit check for the number of columns when resolving such items, and report an error when one produces a row and not a scalar value.

A view reference whose underlying field is a constant is not marked as constant when the reference is part of an inner table of an outer join. It was found that, when pushing a condition down to a 
derived table, the reference was stripped off and only the underlying field was cloned, which made it a constant, and led to wrong results.

To fix this problem, we ensure that we do not push such a condition down to the derived table by adding a check to see first whether the table used by the condition matches the derived table or is a 
constant expression; only when it is one or the other of these do we actually push the condition down.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/databases/mysql80-client/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/mysql80-client/Makefile.common
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/mysql80-client/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/mysql80-client/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/mysql80-client/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/databases/mysql80-client/patches/patch-CMakeLists.txt \
    pkgsrc/databases/mysql80-client/patches/patch-libmysql_CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/mysql80-client/patches/patch-cmake_pkg-config.cmake \
    pkgsrc/databases/mysql80-client/patches/patch-cmake_zlib.cmake \
    pkgsrc/databases/mysql80-client/patches/patch-utilities_CMakeLists.txt
cvs rdiff -u -r1.12 -r1.13 pkgsrc/databases/mysql80-server/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/mysql80-server/PLIST \
    pkgsrc/databases/mysql80-server/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/mysql80-client/Makefile
diff -u pkgsrc/databases/mysql80-client/Makefile:1.9 pkgsrc/databases/mysql80-client/Makefile:1.10
--- pkgsrc/databases/mysql80-client/Makefile:1.9        Wed Apr 19 08:09:26 2023
+++ pkgsrc/databases/mysql80-client/Makefile    Tue May 23 21:01:11 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2023/04/19 08:09:26 adam Exp $
+# $NetBSD: Makefile,v 1.10 2023/05/23 21:01:11 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-client-/}
-PKGREVISION=   2
 COMMENT=       MySQL 8, a free SQL database (client)
 
 CONFLICTS=     mysql3-client-[0-9]* mariadb-client-[0-9]*
@@ -11,8 +10,5 @@ CONFLICTS=    mysql3-client-[0-9]* mariadb-
 CMAKE_ARGS+=           -DWITHOUT_SERVER=ON
 UNWRAP_FILES+=         scripts/mysql_config
 INFO_FILES=            yes
-.for dir in client include libmysql man scripts testclients
-INSTALL_DIRS+=         ${WRKDIR}/build/${dir}
-.endfor
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/mysql80-client/Makefile.common
diff -u pkgsrc/databases/mysql80-client/Makefile.common:1.7 pkgsrc/databases/mysql80-client/Makefile.common:1.8
--- pkgsrc/databases/mysql80-client/Makefile.common:1.7 Tue Jan 24 21:42:47 2023
+++ pkgsrc/databases/mysql80-client/Makefile.common     Tue May 23 21:01:11 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.7 2023/01/24 21:42:47 he Exp $
+# $NetBSD: Makefile.common,v 1.8 2023/05/23 21:01:11 adam Exp $
 #
 # used by databases/mysql80-client/Makefile
 # used by databases/mysql80-server/Makefile
 
-DISTNAME=      mysql-8.0.31
+DISTNAME=      mysql-8.0.33
 CATEGORIES=    databases
 MASTER_SITES=  https://cdn.mysql.com/Downloads/MySQL-8.0/
 DISTFILES=     mysql-boost-${PKGVERSION_NOREV}${EXTRACT_SUFX}
@@ -15,9 +15,8 @@ LICENSE=      gnu-gpl-v2
 DISTINFO_FILE?=        ${.CURDIR}/../../databases/mysql80-client/distinfo
 PATCHDIR?=     ${.CURDIR}/../../databases/mysql80-client/patches
 
-USE_CMAKE=             yes
 USE_LANGUAGES=         c c++14
-USE_TOOLS+=            bash bison gmake perl:run
+USE_TOOLS+=            bash bison gmake perl:run pkg-config
 USE_GCC_RUNTIME=       yes
 USE_BUILTIN.libevent=  no
 
@@ -44,12 +43,6 @@ CONFIG_SHELL=                ${TOOLS_PATH.bash}
 
 BUILD_DEFS+=           VARBASE
 
-CONFIGURE_DIRS=                ${WRKDIR}/build
-CMAKE_ARG_PATH=                ${WRKSRC}
-
-pre-configure:
-       ${MKDIR} ${WRKDIR}/build
-
 # paths
 CMAKE_ARGS+=           -DINSTALL_DOCDIR="share/doc/mysql"
 CMAKE_ARGS+=           -DINSTALL_DOCREADMEDIR="share/doc/mysql"
@@ -67,8 +60,10 @@ CMAKE_ARGS+=         -DMYSQL_DATADIR=${MYSQL_DA
 CMAKE_ARGS+=           -DROUTER_INSTALL_LOGROTATEDIR="share/mysql"
 
 CMAKE_ARGS+=           -DCMAKE_BUILD_TYPE=Release
-
 CMAKE_ARGS+=           -DLOCAL_BOOST_DIR="${WRKSRC}/boost"
+CMAKE_ARGS+=           -DWITH_BUILD_ID=OFF
+CMAKE_ARGS+=           -DWITH_CURL="system"
+CMAKE_ARGS+=           -DWITH_FIDO="system"
 CMAKE_ARGS+=           -DWITH_ICU="system"
 CMAKE_ARGS+=           -DWITH_LIBEVENT="system"
 CMAKE_ARGS+=           -DWITH_LZ4="system"
@@ -79,7 +74,9 @@ CMAKE_ARGS+=          -DWITH_ZSTD="system"
 
 CMAKE_ARGS+=           -DDEFAULT_CHARSET=${MYSQL_CHARSET}
 CMAKE_ARGS+=           -DDEFAULT_COLLATION=${MYSQL_COLLATION}
+CMAKE_ARGS+=           -DSHOW_BUILD_ID=OFF
 CMAKE_ARGS+=           -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET}
+CMAKE_ARGS+=           -DWITH_ROUTER=OFF
 CMAKE_ARGS+=           -DWITH_UNIT_TESTS=OFF
 
 CHECK_PORTABILITY_SKIP+=       packaging/deb-in/mysql-packagesource-server.config.in
@@ -121,12 +118,15 @@ post-patch:
        ${ECHO} "#define alloca(sz) __builtin_alloca(sz)" > ${WRKSRC}/include/alloca.h
 .endif
 
-.include "../../mk/atomic64.mk"
 .include "../../archivers/lz4/buildlink3.mk"
 .include "../../archivers/zstd/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../devel/libevent/buildlink3.mk"
 BUILDLINK_API_DEPENDS.zlib+=   zlib>=1.2.11
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/curses.buildlink3.mk"
+.include "../../security/libfido2/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+.include "../../mk/atomic64.mk"
+.include "../../mk/curses.buildlink3.mk"

Index: pkgsrc/databases/mysql80-client/PLIST
diff -u pkgsrc/databases/mysql80-client/PLIST:1.2 pkgsrc/databases/mysql80-client/PLIST:1.3
--- pkgsrc/databases/mysql80-client/PLIST:1.2   Wed Nov  2 17:02:10 2022
+++ pkgsrc/databases/mysql80-client/PLIST       Tue May 23 21:01:12 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2022/11/02 17:02:10 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.3 2023/05/23 21:01:12 adam Exp $
 bin/mysql
 bin/mysql_client_test
 bin/mysql_config
@@ -29,7 +29,7 @@ include/mysql/mysqld_error.h
 lib/libmysqlclient.a
 lib/libmysqlclient.so
 lib/libmysqlclient.so.21
-lib/libmysqlclient.so.21.2.31
+lib/libmysqlclient.so.21.2.33
 lib/pkgconfig/mysqlclient.pc
 man/man1/comp_err.1
 man/man1/ibd2sdi.1
@@ -63,3 +63,56 @@ man/man1/mysqlslap.1
 man/man1/perror.1
 man/man1/zlib_decompress.1
 man/man8/mysqld.8
+share/mysql/bulgarian/errmsg.sys
+share/mysql/charsets/Index.xml
+share/mysql/charsets/README
+share/mysql/charsets/armscii8.xml
+share/mysql/charsets/ascii.xml
+share/mysql/charsets/cp1250.xml
+share/mysql/charsets/cp1251.xml
+share/mysql/charsets/cp1256.xml
+share/mysql/charsets/cp1257.xml
+share/mysql/charsets/cp850.xml
+share/mysql/charsets/cp852.xml
+share/mysql/charsets/cp866.xml
+share/mysql/charsets/dec8.xml
+share/mysql/charsets/geostd8.xml
+share/mysql/charsets/greek.xml
+share/mysql/charsets/hebrew.xml
+share/mysql/charsets/hp8.xml
+share/mysql/charsets/keybcs2.xml
+share/mysql/charsets/koi8r.xml
+share/mysql/charsets/koi8u.xml
+share/mysql/charsets/latin1.xml
+share/mysql/charsets/latin2.xml
+share/mysql/charsets/latin5.xml
+share/mysql/charsets/latin7.xml
+share/mysql/charsets/macce.xml
+share/mysql/charsets/macroman.xml
+share/mysql/charsets/swe7.xml
+share/mysql/czech/errmsg.sys
+share/mysql/danish/errmsg.sys
+share/mysql/dictionary.txt
+share/mysql/dutch/errmsg.sys
+share/mysql/english/errmsg.sys
+share/mysql/estonian/errmsg.sys
+share/mysql/french/errmsg.sys
+share/mysql/german/errmsg.sys
+share/mysql/greek/errmsg.sys
+share/mysql/hungarian/errmsg.sys
+share/mysql/italian/errmsg.sys
+share/mysql/japanese/errmsg.sys
+share/mysql/korean/errmsg.sys
+share/mysql/messages_to_clients.txt
+share/mysql/messages_to_error_log.txt
+share/mysql/norwegian-ny/errmsg.sys
+share/mysql/norwegian/errmsg.sys
+share/mysql/polish/errmsg.sys
+share/mysql/portuguese/errmsg.sys
+share/mysql/romanian/errmsg.sys
+share/mysql/russian/errmsg.sys
+share/mysql/serbian/errmsg.sys
+share/mysql/slovak/errmsg.sys
+share/mysql/spanish/errmsg.sys
+share/mysql/swedish/errmsg.sys
+share/mysql/ukrainian/errmsg.sys

Index: pkgsrc/databases/mysql80-client/buildlink3.mk
diff -u pkgsrc/databases/mysql80-client/buildlink3.mk:1.3 pkgsrc/databases/mysql80-client/buildlink3.mk:1.4
--- pkgsrc/databases/mysql80-client/buildlink3.mk:1.3   Tue Jun 28 11:31:19 2022
+++ pkgsrc/databases/mysql80-client/buildlink3.mk       Tue May 23 21:01:12 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2022/06/28 11:31:19 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2023/05/23 21:01:12 adam Exp $
 
 BUILDLINK_TREE+=       mysql-client
 
@@ -6,12 +6,11 @@ BUILDLINK_TREE+=      mysql-client
 MYSQL_CLIENT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.mysql-client+=   mysql-client>=8.0.19<8.1
-BUILDLINK_ABI_DEPENDS.mysql-client?=   mysql-client>=8.0.24nb4
+BUILDLINK_ABI_DEPENDS.mysql-client+=   mysql-client>=8.0.24nb4
 BUILDLINK_PKGSRCDIR.mysql-client?=     ../../databases/mysql80-client
 BUILDLINK_INCDIRS.mysql-client?=       include/mysql
 BUILDLINK_LIBDIRS.mysql-client?=       lib
 
-.include "../../devel/libevent/buildlink3.mk"
 .include "../../archivers/zstd/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/databases/mysql80-client/distinfo
diff -u pkgsrc/databases/mysql80-client/distinfo:1.8 pkgsrc/databases/mysql80-client/distinfo:1.9
--- pkgsrc/databases/mysql80-client/distinfo:1.8        Sun Nov 27 22:12:25 2022
+++ pkgsrc/databases/mysql80-client/distinfo    Tue May 23 21:01:12 2023
@@ -1,13 +1,15 @@
-$NetBSD: distinfo,v 1.8 2022/11/27 22:12:25 nia Exp $
+$NetBSD: distinfo,v 1.9 2023/05/23 21:01:12 adam Exp $
 
-BLAKE2s (mysql-boost-8.0.31.tar.gz) = 2da23b9233a2c5060aa22074cbe990d0dc1d90b2e55a4cd4b32571d2c77fe3bf
-SHA512 (mysql-boost-8.0.31.tar.gz) = 87b1678de8c2fd640fd6f3ae58266ea63fe240578330e3296d0e5fc209bbe9b0c22996214b6ca4cce8c0d9cc2f9897f4e6723d835b33fc4342983c82929c3d96
-Size (mysql-boost-8.0.31.tar.gz) = 334504577 bytes
-SHA1 (patch-CMakeLists.txt) = 6179dd8ff880e40ca5b309b5a63c55ac80875c15
+BLAKE2s (mysql-boost-8.0.33.tar.gz) = 6b64fb998afe1854c6a9168b82a11e4254d30d439d4730914863e86ea4ff9071
+SHA512 (mysql-boost-8.0.33.tar.gz) = 47f76819004c7c545d1b0b6b6646d8816899976f92d35c5564b1255b144b597ff7d3e674c721a45bcbb13cc0da3f4474fb29221c0e21d2ff91a1892cd42c636c
+Size (mysql-boost-8.0.33.tar.gz) = 438065679 bytes
+SHA1 (patch-CMakeLists.txt) = a1c3f95fab72031f4338a6b44b63551a6a388817
 SHA1 (patch-client_CMakeLists.txt) = 4fbaf94d43b6c58aa14712213c08b897bd6227cf
 SHA1 (patch-cmake_ldap.cmake) = 46f0df1109ca0886e0d0903a39e25278139f1849
 SHA1 (patch-cmake_os_SunOS.cmake) = 66a7d4386f07c68ae85a94d467465e6d1bec6b57
+SHA1 (patch-cmake_pkg-config.cmake) = 82498a310f8f428e26b722a40031bc1d6d272242
 SHA1 (patch-cmake_readline.cmake) = fb79ed969240ae2984098f72c2d3fb501154902c
+SHA1 (patch-cmake_zlib.cmake) = 963c2d5af00ed9df37ae261ae91a1ddae3415be9
 SHA1 (patch-config.h.cmake) = e6debea316c5bb8338afb693d704007d45b3941f
 SHA1 (patch-configure.cmake) = b03de49ecb8d6ce58ef24f5dcd8f0a8c95eab592
 SHA1 (patch-include_CMakeLists.txt) = 289c1454d1b7e7fe8566187b3cefc722260993b6
@@ -16,7 +18,7 @@ SHA1 (patch-include_my__thread.h) = a88f
 SHA1 (patch-include_my__thread__os__id.h) = 383923523623d0811915d5d75c523904102dcf43
 SHA1 (patch-include_tables__contained__in.h) = c332b10760ef8b7f16b1e94821b79589f525e4e7
 SHA1 (patch-include_violite.h) = adbdf539d2ec0e225e1c38a7a1ec8b4cfb28f4d0
-SHA1 (patch-libmysql_CMakeLists.txt) = cbc2185e52194de1bcdfe5e2af7bfc857e747acd
+SHA1 (patch-libmysql_CMakeLists.txt) = 7b83faf1751ad40f20bca1ebcdac0cebb1370443
 SHA1 (patch-mysys_kqueue__timers.cc) = 837474b779c24dd0af67444c2adbcf07b73e0d36
 SHA1 (patch-mysys_stacktrace.cc) = 6792ceaae3c3b0d70bd8b6c848a128d50397e6f4
 SHA1 (patch-router_CMakeLists.txt) = 9bfd1278c42070ada0606dfff34a66b8b95d0413
@@ -34,4 +36,5 @@ SHA1 (patch-sql_resourcegroups_platform_
 SHA1 (patch-sql_resourcegroups_platform_thread__attrs__api__solaris.cc) = 1ce0aec798a22f966c37d9ee38b3dee3d855a7e3
 SHA1 (patch-storage_innobase_include_detail_ut_large__page__alloc-linux.h) = cc5bdab29e542f172dc6d4c0d4af1f264e37ba35
 SHA1 (patch-storage_innobase_include_detail_ut_large__page__alloc-solaris.h) = 2b41381af66e22231e897ebc97346c13b1f1e3a7
+SHA1 (patch-utilities_CMakeLists.txt) = 61f18c7639977d15591507ad7e4facb685a4ffb4
 SHA1 (patch-vio_viosocket.cc) = fcbe1eccb58fb840857f22178291ed2fb2c870b0

Index: pkgsrc/databases/mysql80-client/patches/patch-CMakeLists.txt
diff -u pkgsrc/databases/mysql80-client/patches/patch-CMakeLists.txt:1.2 pkgsrc/databases/mysql80-client/patches/patch-CMakeLists.txt:1.3
--- pkgsrc/databases/mysql80-client/patches/patch-CMakeLists.txt:1.2    Wed Nov  2 17:02:10 2022
+++ pkgsrc/databases/mysql80-client/patches/patch-CMakeLists.txt        Tue May 23 21:01:12 2023
@@ -1,31 +1,56 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2022/11/02 17:02:10 jperkin Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2023/05/23 21:01:12 adam Exp $
 
 Split configuration between mysql-client and mysql-server.
+Do not install documentation.
 
---- CMakeLists.txt.orig        2022-09-13 16:15:16.000000000 +0000
+--- CMakeLists.txt.orig        2023-03-16 17:22:37.000000000 +0000
 +++ CMakeLists.txt
-@@ -2192,8 +2192,9 @@ ADD_SUBDIRECTORY(utilities)
- ADD_SUBDIRECTORY(share)
+@@ -2185,11 +2185,12 @@ ENDIF()
+ 
+ ADD_SUBDIRECTORY(client)
+ ADD_SUBDIRECTORY(utilities)
+-ADD_SUBDIRECTORY(share)
  ADD_SUBDIRECTORY(libservices)
  
 -IF(NOT WITHOUT_SERVER)
 +IF(WITHOUT_SERVER)
++  ADD_SUBDIRECTORY(share)
    ADD_SUBDIRECTORY(testclients)
 +ELSE()
    ADD_SUBDIRECTORY(sql)
  ENDIF()
  
-@@ -2278,11 +2279,9 @@ IF(ENABLE_GCOV)
+@@ -2280,7 +2281,7 @@ IF(ENABLE_GCOV)
    INCLUDE(fastcov)
  ENDIF()
  
 -IF(UNIX)
-+IF(WITHOUT_SERVER)
++IF(UNIX AND WITHOUT_SERVER)
    ADD_SUBDIRECTORY(man)
--ENDIF()
--
--IF(NOT WITHOUT_SERVER)
-+ELSE()
-   ADD_SUBDIRECTORY(packaging/rpm-common)
-   ADD_SUBDIRECTORY(packaging/rpm-oel)
-   ADD_SUBDIRECTORY(packaging/rpm-fedora)
+ ENDIF()
+ 
+@@ -2314,6 +2315,7 @@ SET_PROPERTY(DIRECTORY APPEND PROPERTY A
+   "${CMAKE_BINARY_DIR}/library_output_directory"
+   )
+ 
++IF(HAVE_BUILD_ID_SUPPORT AND NOT WITHOUT_SERVER)
+ # Handle the "INFO_*" files.
+ INCLUDE(${CMAKE_BINARY_DIR}/info_macros.cmake)
+ # Source: This can be done during the cmake phase, all information is
+@@ -2327,7 +2329,6 @@ MY_ADD_CUSTOM_TARGET(INFO_SRC ALL
+   COMMENT "Generating Docs/INFO_SRC"
+ )
+ 
+-IF(HAVE_BUILD_ID_SUPPORT AND NOT WITHOUT_SERVER)
+   # Show it by default in pushuild, but not for developers.
+   IF(DEFINED ENV{PB2WORKDIR})
+     OPTION(SHOW_BUILD_ID "Show mysqld build id as final target" ON)
+@@ -2438,7 +2439,7 @@ ENDIF()
+ #
+ # RPM installs documentation directly from the source tree
+ #
+-IF(NOT INSTALL_LAYOUT MATCHES "RPM")
++IF(FALSE)
+   INSTALL(FILES
+     README
+     LICENSE
Index: pkgsrc/databases/mysql80-client/patches/patch-libmysql_CMakeLists.txt
diff -u pkgsrc/databases/mysql80-client/patches/patch-libmysql_CMakeLists.txt:1.2 pkgsrc/databases/mysql80-client/patches/patch-libmysql_CMakeLists.txt:1.3
--- pkgsrc/databases/mysql80-client/patches/patch-libmysql_CMakeLists.txt:1.2   Wed Nov  2 17:02:10 2022
+++ pkgsrc/databases/mysql80-client/patches/patch-libmysql_CMakeLists.txt       Tue May 23 21:01:12 2023
@@ -1,12 +1,13 @@
-$NetBSD: patch-libmysql_CMakeLists.txt,v 1.2 2022/11/02 17:02:10 jperkin Exp $
+$NetBSD: patch-libmysql_CMakeLists.txt,v 1.3 2023/05/23 21:01:12 adam Exp $
 
 Do not install libmysqlclient with the server.
 Generate versioned lib symlinks on FreeBSD to supress PLIST divergence.
 authentication_ldap and libmysql_api_test require libmysqld.
+Don't bother with libmysql_api_test - requires libmysqlclient installed.
 
---- libmysql/CMakeLists.txt.orig       2022-09-13 16:15:16.000000000 +0000
+--- libmysql/CMakeLists.txt.orig       2023-03-16 17:22:37.000000000 +0000
 +++ libmysql/CMakeLists.txt
-@@ -286,8 +286,14 @@ ADD_SUBDIRECTORY(authentication_kerberos
+@@ -289,8 +289,14 @@ ADD_SUBDIRECTORY(authentication_kerberos
  # authentication IAM client plug-in
  ADD_SUBDIRECTORY(authentication_oci_client)
  
@@ -22,7 +23,7 @@ authentication_ldap and libmysql_api_tes
    COMPONENT Development
    LINK_LIBRARIES ${LIBS_TO_LINK}
    )
-@@ -325,7 +331,7 @@ ENDIF()
+@@ -328,7 +334,7 @@ ENDIF()
  
  IF(UNIX)
    SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
@@ -31,7 +32,7 @@ authentication_ldap and libmysql_api_tes
      STRING_APPEND(OS_SHARED_LIB_VERSION
        ".${SHARED_LIB_MINOR_VERSION}.${SHARED_LIB_PATCH_VERSION}")
    ENDIF()
-@@ -337,7 +343,7 @@ ENDIF()
+@@ -340,7 +346,7 @@ ENDIF()
  
  # Merge several convenience libraries into one big mysqlclient
  # and link them together into shared library.
@@ -40,16 +41,16 @@ authentication_ldap and libmysql_api_tes
    EXPORTS
    ${CLIENT_API_FUNCTIONS}
    ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
-@@ -403,6 +409,7 @@ CONFIGURE_FILE(api_test.c.in ${CMAKE_CUR
+@@ -406,6 +412,7 @@ CONFIGURE_FILE(api_test.c.in ${CMAKE_CUR
  # from @CLIENT_API_FUNCTIONS@ are declared by <mysql.h>. It will fail
  # to run if not all of these symbols are exported by the library.
  #
-+IF(NOT WITHOUT_SERVER)
++IF(FALSE)
  MYSQL_ADD_EXECUTABLE(libmysql_api_test
    ${CMAKE_CURRENT_BINARY_DIR}/api_test.c
    LINK_LIBRARIES libmysql ${LIBRT}
-@@ -432,3 +439,4 @@ MY_ADD_CUSTOM_TARGET(run_libmysql_api_te
-   COMMAND libmysql_api_test
-   > ${CMAKE_CURRENT_BINARY_DIR}/libmysql_api_test.out
+@@ -439,3 +446,4 @@ ADD_CUSTOM_COMMAND(
+ MY_ADD_CUSTOM_TARGET(run_libmysql_api_test ALL
+   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/libmysql_api_test.out
    )
 +ENDIF()

Index: pkgsrc/databases/mysql80-server/Makefile
diff -u pkgsrc/databases/mysql80-server/Makefile:1.12 pkgsrc/databases/mysql80-server/Makefile:1.13
--- pkgsrc/databases/mysql80-server/Makefile:1.12       Wed Apr 19 08:09:26 2023
+++ pkgsrc/databases/mysql80-server/Makefile    Tue May 23 21:01:12 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2023/04/19 08:09:26 adam Exp $
+# $NetBSD: Makefile,v 1.13 2023/05/23 21:01:12 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   2
 COMMENT=       MySQL 8, a free SQL database (server)
 
 CONFLICTS=     mysql3-server-[0-9]*
@@ -75,7 +74,7 @@ SUBST_SED.perlpath=   -e 's,@PERL_PATH@,${
 INSTALLATION_DIRS+=    bin
 TEST_TARGET=           test
 
-CMAKE_ARGS+=           -DWITHOUT_CLIENTLIBS="ON"
+CMAKE_ARGS+=           -DWITHOUT_CLIENTLIBS=ON
 
 post-extract:
        ${CP} ${FILESDIR}/ffsll.cc ${WRKSRC}/sql/

Index: pkgsrc/databases/mysql80-server/PLIST
diff -u pkgsrc/databases/mysql80-server/PLIST:1.3 pkgsrc/databases/mysql80-server/PLIST:1.4
--- pkgsrc/databases/mysql80-server/PLIST:1.3   Wed Nov  2 17:02:11 2022
+++ pkgsrc/databases/mysql80-server/PLIST       Tue May 23 21:01:12 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2022/11/02 17:02:11 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.4 2023/05/23 21:01:12 adam Exp $
 bin/comp_err
 bin/ibd2sdi
 bin/innochecksum
@@ -14,31 +14,14 @@ bin/mysql_upgrade
 bin/mysqld_multi
 bin/mysqld_safe
 bin/mysqldumpslow
-bin/mysqlrouter
-bin/mysqlrouter_keyring
-bin/mysqlrouter_passwd
-bin/mysqlrouter_plugin_info
 bin/mysqltest
 bin/mysqltest_safe_process
 bin/mysqlxtest
 bin/perror
 bin/zlib_decompress
-docs/sample_mysqlrouter.conf
 include/mysql/mysqlx_ername.h
 include/mysql/mysqlx_error.h
 include/mysql/mysqlx_version.h
-lib/libmysqlharness.so.1
-lib/libmysqlharness_stdx.so.1
-lib/libmysqlharness_tls.so.1
-lib/libmysqlrouter.so.1
-lib/libmysqlrouter_connection_pool.so.1
-lib/libmysqlrouter_http.so.1
-lib/libmysqlrouter_http_auth_backend.so.1
-lib/libmysqlrouter_http_auth_realm.so.1
-lib/libmysqlrouter_io_component.so.1
-lib/libmysqlrouter_metadata_cache.so.1
-lib/libmysqlrouter_mysqlxmessages.so.1
-lib/libmysqlrouter_routing.so.1
 lib/libmysqlservices.a
 lib/mysql/plugin/adt_null.so
 lib/mysql/plugin/auth.so
@@ -67,9 +50,11 @@ lib/mysql/plugin/component_test_mysql_co
 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
@@ -155,86 +140,10 @@ lib/mysql/plugin/test_udf_services.so
 lib/mysql/plugin/udf_example.so
 lib/mysql/plugin/validate_password.so
 lib/mysql/plugin/version_token.so
-lib/mysqlrouter/connection_pool.so
-lib/mysqlrouter/http_auth_backend.so
-lib/mysqlrouter/http_auth_realm.so
-lib/mysqlrouter/http_server.so
-lib/mysqlrouter/io.so
-lib/mysqlrouter/keepalive.so
-lib/mysqlrouter/metadata_cache.so
-lib/mysqlrouter/rest_api.so
-lib/mysqlrouter/rest_connection_pool.so
-lib/mysqlrouter/rest_metadata_cache.so
-lib/mysqlrouter/rest_router.so
-lib/mysqlrouter/rest_routing.so
-lib/mysqlrouter/router_openssl.so
-lib/mysqlrouter/router_protobuf.so
-lib/mysqlrouter/routing.so
 sbin/mysqld
 share/aclocal/mysql.m4
-share/doc/mysql/ChangeLog
-share/doc/mysql/INFO_BIN
-share/doc/mysql/INFO_SRC
-share/doc/mysql/LICENSE
-share/doc/mysql/LICENSE.router
-share/doc/mysql/README
-share/doc/mysql/README.router
-share/mysql/bulgarian/errmsg.sys
-share/mysql/charsets/Index.xml
-share/mysql/charsets/README
-share/mysql/charsets/armscii8.xml
-share/mysql/charsets/ascii.xml
-share/mysql/charsets/cp1250.xml
-share/mysql/charsets/cp1251.xml
-share/mysql/charsets/cp1256.xml
-share/mysql/charsets/cp1257.xml
-share/mysql/charsets/cp850.xml
-share/mysql/charsets/cp852.xml
-share/mysql/charsets/cp866.xml
-share/mysql/charsets/dec8.xml
-share/mysql/charsets/geostd8.xml
-share/mysql/charsets/greek.xml
-share/mysql/charsets/hebrew.xml
-share/mysql/charsets/hp8.xml
-share/mysql/charsets/keybcs2.xml
-share/mysql/charsets/koi8r.xml
-share/mysql/charsets/koi8u.xml
-share/mysql/charsets/latin1.xml
-share/mysql/charsets/latin2.xml
-share/mysql/charsets/latin5.xml
-share/mysql/charsets/latin7.xml
-share/mysql/charsets/macce.xml
-share/mysql/charsets/macroman.xml
-share/mysql/charsets/swe7.xml
-share/mysql/czech/errmsg.sys
-share/mysql/danish/errmsg.sys
-share/mysql/dictionary.txt
-share/mysql/dutch/errmsg.sys
-share/mysql/english/errmsg.sys
-share/mysql/estonian/errmsg.sys
-share/mysql/french/errmsg.sys
-share/mysql/german/errmsg.sys
-share/mysql/greek/errmsg.sys
-share/mysql/hungarian/errmsg.sys
 share/mysql/install_rewriter.sql
-share/mysql/italian/errmsg.sys
-share/mysql/japanese/errmsg.sys
-share/mysql/korean/errmsg.sys
-share/mysql/messages_to_clients.txt
-share/mysql/messages_to_error_log.txt
 share/mysql/mysql-log-rotate
 share/mysql/mysql.server
 share/mysql/mysqld_multi.server
-share/mysql/mysqlrouter-log-rotate
-share/mysql/norwegian-ny/errmsg.sys
-share/mysql/norwegian/errmsg.sys
-share/mysql/polish/errmsg.sys
-share/mysql/portuguese/errmsg.sys
-share/mysql/romanian/errmsg.sys
-share/mysql/russian/errmsg.sys
-share/mysql/serbian/errmsg.sys
-share/mysql/slovak/errmsg.sys
-share/mysql/spanish/errmsg.sys
-share/mysql/swedish/errmsg.sys
-share/mysql/ukrainian/errmsg.sys
 share/mysql/uninstall_rewriter.sql
Index: pkgsrc/databases/mysql80-server/buildlink3.mk
diff -u pkgsrc/databases/mysql80-server/buildlink3.mk:1.3 pkgsrc/databases/mysql80-server/buildlink3.mk:1.4
--- pkgsrc/databases/mysql80-server/buildlink3.mk:1.3   Wed Nov  2 17:02:11 2022
+++ pkgsrc/databases/mysql80-server/buildlink3.mk       Tue May 23 21:01:12 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2022/11/02 17:02:11 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2023/05/23 21:01:12 adam Exp $
 
 BUILDLINK_TREE+=       mysql-server
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        mysql-server
 MYSQL_SERVER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.mysql-server+=   mysql-server>=5.7.12
-BUILDLINK_ABI_DEPENDS.mysql-server?=   mysql-server>=8.0.24nb7
+BUILDLINK_ABI_DEPENDS.mysql-server+=   mysql-server>=8.0.24nb7
 BUILDLINK_PKGSRCDIR.mysql-server?=     ../../databases/mysql80-server
 BUILDLINK_LIBDIRS.mysql-server?=       lib
 

Added files:

Index: pkgsrc/databases/mysql80-client/patches/patch-cmake_pkg-config.cmake
diff -u /dev/null pkgsrc/databases/mysql80-client/patches/patch-cmake_pkg-config.cmake:1.1
--- /dev/null   Tue May 23 21:01:12 2023
+++ pkgsrc/databases/mysql80-client/patches/patch-cmake_pkg-config.cmake        Tue May 23 21:01:12 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-cmake_pkg-config.cmake,v 1.1 2023/05/23 21:01:12 adam Exp $
+
+Detect pkg-config on other systems.
+
+--- cmake/pkg-config.cmake.orig        2023-05-23 14:53:30.967918710 +0000
++++ cmake/pkg-config.cmake
+@@ -21,7 +21,7 @@
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+ 
+ MACRO(MYSQL_CHECK_PKGCONFIG)
+-  IF(LINUX OR FREEBSD)
++  IF(UNIX)
+     # Do a sanity check, before bailing out in FIND_PACKAGE below.
+     FIND_PROGRAM(MY_PKG_CONFIG_EXECUTABLE NAMES pkg-config
+       DOC "pkg-config executable")
Index: pkgsrc/databases/mysql80-client/patches/patch-cmake_zlib.cmake
diff -u /dev/null pkgsrc/databases/mysql80-client/patches/patch-cmake_zlib.cmake:1.1
--- /dev/null   Tue May 23 21:01:12 2023
+++ pkgsrc/databases/mysql80-client/patches/patch-cmake_zlib.cmake      Tue May 23 21:01:12 2023
@@ -0,0 +1,26 @@
+$NetBSD: patch-cmake_zlib.cmake,v 1.1 2023/05/23 21:01:12 adam Exp $
+
+Fix zlib detection.
+
+--- cmake/zlib.cmake.orig      2023-05-23 08:13:52.000000000 +0000
++++ cmake/zlib.cmake
+@@ -60,6 +60,8 @@ FUNCTION(FIND_SYSTEM_ZLIB)
+       TARGET_INCLUDE_DIRECTORIES(zlib_interface SYSTEM INTERFACE
+         ${ZLIB_INCLUDE_DIR})
+     ENDIF()
++  ELSE()
++    MESSAGE(FATAL_ERROR "Cannot find system zlib libraries.")
+   ENDIF()
+ ENDFUNCTION(FIND_SYSTEM_ZLIB)
+ 
+@@ -114,9 +116,7 @@ MACRO (MYSQL_CHECK_ZLIB)
+     MYSQL_USE_BUNDLED_ZLIB()
+   ELSEIF(WITH_ZLIB STREQUAL "system")
+     FIND_SYSTEM_ZLIB()
+-    IF(NOT ZLIB_FOUND)
+-      MESSAGE(FATAL_ERROR "Cannot find system zlib libraries.")
+-    ENDIF()
++    FIND_ZLIB_VERSION(${ZLIB_INCLUDE_DIR})
+   ELSE()
+     RESET_ZLIB_VARIABLES()
+     MESSAGE(FATAL_ERROR "WITH_ZLIB must be bundled or system")
Index: pkgsrc/databases/mysql80-client/patches/patch-utilities_CMakeLists.txt
diff -u /dev/null pkgsrc/databases/mysql80-client/patches/patch-utilities_CMakeLists.txt:1.1
--- /dev/null   Tue May 23 21:01:12 2023
+++ pkgsrc/databases/mysql80-client/patches/patch-utilities_CMakeLists.txt      Tue May 23 21:01:12 2023
@@ -0,0 +1,48 @@
+$NetBSD: patch-utilities_CMakeLists.txt,v 1.1 2023/05/23 21:01:12 adam Exp $
+
+Split configuration between mysql-client and mysql-server.
+
+--- utilities/CMakeLists.txt.orig      2023-03-16 17:22:37.000000000 +0000
++++ utilities/CMakeLists.txt
+@@ -24,11 +24,18 @@ ADD_WSHADOW_WARNING()
+ DISABLE_MISSING_PROFILE_WARNING()
+ MSVC_CPPCHECK_DISABLE()
+ 
++IF(WITHOUT_SERVER)
++  SET(CLIENT_SKIP_INSTALL SKIP_INSTALL)
++ELSE()
++  SET(CLIENT_SKIP_INSTALL "")
++ENDIF()
++
+ IF(NOT CMAKE_CROSSCOMPILING)
+   MYSQL_ADD_EXECUTABLE(comp_err
+     comp_err.cc
+     COMPONENT Test
+     LINK_LIBRARIES mysys
++    ${CLIENT_SKIP_INSTALL}
+     )
+ ENDIF()
+ 
+@@ -117,12 +124,14 @@ MYSQL_ADD_EXECUTABLE(my_print_defaults
+   my_print_defaults.cc
+   COMPONENT Server
+   LINK_LIBRARIES mysys
++  ${CLIENT_SKIP_INSTALL}
+   )
+ MYSQL_ADD_EXECUTABLE(perror
+   perror.cc
+   COMPONENT Server
+   DEPENDENCIES GenError
+   LINK_LIBRARIES mysys
++  ${CLIENT_SKIP_INSTALL}
+   )
+ IF(WITH_LZ4 STREQUAL "bundled")
+   MYSQL_ADD_EXECUTABLE(lz4_decompress
+@@ -136,6 +145,7 @@ MYSQL_ADD_EXECUTABLE(zlib_decompress
+   zlib_decompress.cc
+   COMPONENT Server
+   LINK_LIBRARIES ext::zlib mysys
++  ${CLIENT_SKIP_INSTALL}
+   )
+ 
+ # All targets below belong to COMPONENT Server and depend on InnoDB.