diff --git a/databases/mysql84-client/Makefile b/databases/mysql84-client/Makefile index bfb4f1e7263d..a49c38ce338d 100644 --- a/databases/mysql84-client/Makefile +++ b/databases/mysql84-client/Makefile @@ -1,51 +1,51 @@ PORTNAME= mysql -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= 84-client COMMENT= Multithreaded SQL database (client) LICENSE+= LGPL21 # MySQL8.2+ supports only 64-bit platforms # Review list after 13.x EoL NOT_FOR_ARCHS= armv6 armv7 i386 powerpc MASTERDIR= ${.CURDIR}/../mysql84-server PKGMESSAGE= ${.CURDIR}/pkg-message PATCHDIR= ${MASTERDIR}/files PLIST= ${.CURDIR}/pkg-plist CONFLICTS_INSTALL= mysql8[1-9]-client \ mysql[0-79][0-9]-client \ mariadb[0-9][0-9]-client \ percona[0-9][0-9]-client CMAKE_ARGS+= -DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILESDIR=0 USE_LDCONFIG+= ${PREFIX}/lib/mysql MMAN1= comp_err.1 lz4_decompress.1 mysql.1 mysql_config.1 mysql_config_editor.1 \ mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlman.1 \ mysqlpump.1 mysqlshow.1 mysqlslap.1 perror.1 zlib_decompress.1 CLIENT_ONLY= yes OPTIONS_GROUP+= PLUGINS PLUGINS_DESC= Default Client Plugins OPTIONS_GROUP_PLUGINS= SASLCLIENT SASLCLIENT_DESC= SASL client plugin module SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASLCLIENT_USES= ldap OPTIONS_DEFAULT+= SASLCLIENT OPTIONS_SUB= yes post-install: @${RM} -r ${STAGEDIR}${PREFIX}/lib/mysql/private @${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a @${LN} -s libmysqlclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so @${LN} -s libmysqlclient.so.24 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.24 .include "${MASTERDIR}/Makefile" diff --git a/databases/mysql84-server/Makefile b/databases/mysql84-server/Makefile index ce48cb0c0a53..d08f5e792067 100644 --- a/databases/mysql84-server/Makefile +++ b/databases/mysql84-server/Makefile @@ -1,182 +1,182 @@ PORTNAME?= mysql -PORTVERSION= 8.4.3 -PORTREVISION= 1 +PORTVERSION= 8.4.5 +PORTREVISION= 0 CATEGORIES= databases MASTER_SITES= MYSQL/MySQL-8.4 PKGNAMESUFFIX?= 84-server MAINTAINER= joneum@FreeBSD.org COMMENT?= Multithreaded SQL database (server) WWW= https://www.mysql.com/ LICENSE= GPLv2 # MySQL8.2+ supports only 64-bit platforms # Review list after 13.x EoL NOT_FOR_ARCHS= armv6 armv7 i386 powerpc USES= bison:build cmake:noninja cpe groff:run libedit localbase \ ncurses perl5 pkgconfig shebangfix ssl compiler:c++20-lang WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX} SLAVEDIRS= databases/mysql84-client CPE_VENDOR= oracle USE_CXXSTD= c++20 USE_PERL5= run MY_DBDIR= /var/db/mysql MY_SECDIR= /var/db/mysql_secure MY_TMPDIR= /var/db/mysql_tmpdir LIB_DEPENDS+= libcurl.so:ftp/curl \ libicutu.so:devel/icu \ liblz4.so:archivers/liblz4 \ libhidapi.so:comms/hidapi \ libfido2.so:security/libfido2 \ ${LIB_DEPENDS_${ARCH}} LIB_DEPENDS_aarch64= libunwind.so:devel/libunwind LIB_DEPENDS_amd64= libunwind.so:devel/libunwind LIB_DEPENDS_powerpc64= libunwind.so:devel/libunwind LIB_DEPENDS_powerpc64le= libunwind.so:devel/libunwind BUILD_DEPENDS= liblz4>0:archivers/liblz4 \ ${BUILD_DEPENDS_${ARCH}} BUILD_DEPENDS_aarch64= libunwind>0:devel/libunwind BUILD_DEPENDS_amd64= libunwind>0:devel/libunwind BUILD_DEPENDS_powerpc64= libunwind>0:devel/libunwind BUILD_DEPENDS_powerpc64le= libunwind>0:devel/libunwind CMAKE_BUILD_TYPE= Release CFLAGS+= -fPIC CFLAGS_aarch64?= -march=armv8-a+crc+crypto CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \ -DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \ -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_INFODIR="${INFO_PATH}" \ -DINSTALL_LIBDIR="lib/mysql" \ -DINSTALL_PRIV_LIBDIR="lib/mysql/private" \ -DINSTALL_MANDIR="share/man" \ -DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \ -DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR="" \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DWITH_BOOST="${WRKSRC}/boost" \ -DWITH_SYSTEM_LIBS=1 \ -DWITH_EDITLINE=system \ -DWITH_LZ4=system \ -DWITH_ICU=system \ -DWITH_CURL=system \ -DWITH_ZSTD=bundled \ -DWITH_PROTOBUF=bundled \ -DWITH_SSL=system \ -DWITH_ZLIB=system \ -DWITH_LZ4=system SHEBANG_FILES= scripts/*.pl* scripts/*.sh .ifdef USE_MYSQL IGNORE= you have `USE_MYSQL' variable defined either in environment or in make(1) arguments, please undefine and try again .endif SUB_LIST= MY_DBDIR=${MY_DBDIR} \ MY_SECDIR=${MY_SECDIR} \ MY_TMPDIR=${MY_TMPDIR} PLIST_SUB= MY_DBDIR=${MY_DBDIR} \ MY_SECDIR=${MY_SECDIR} \ MY_TMPDIR=${MY_TMPDIR} # MySQL-Server part .if !defined(CLIENT_ONLY) USES+= mysql:84 CONFLICTS_INSTALL= mysql*-server \ mysqlwsrep*-server \ mariadb*-server \ percona*-server USE_RC_SUBR= mysql-server SUB_FILES= my.cnf.sample pkg-message USERS= mysql GROUPS= mysql USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin MMAN1= ibd2sdi.1 innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 \ myisamlog.1 myisampack.1 mysql_secure_installation.1 mysql_ssl_rsa_setup.1 \ mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql.server.1 mysqldumpslow.1 mysqld_multi.1 \ mysqld_safe.1 mysqlrouter_passwd.1 mysqlrouter_plugin_info.1 mysqlrouter.1 MMAN8= mysqld.8 CMAKE_ARGS+= -DWITHOUT_CLIENTLIBS="ON" # Disable unit tests, it fails on !amd64 and <13.0 due to c++17 rules CMAKE_ARGS+= -DWITH_UNIT_TESTS="OFF" OPTIONS_GROUP= STORAGE OPTIONS_GROUP_STORAGE= ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA OPTIONS_SUB= YES STORAGE_DESC= Permissible "Storage Engines" (to compile statically into the server) ARCHIVE_DESC= Compile "Archive Storage" statically in server BLACKHOLE_DESC= Compile "Blackhole Storage" statically in server EXAMPLE_DESC= Compile "Example Storage" statically in server FEDERATED_DESC= Compile "Federated Storage" statically in server INNOBASE_DESC= Compile "InnoDB Storage" statically in server PARTITION_DESC= Compile "Partitioning support Storage" statically in server PERFSCHEMA_DESC= Compile "Performance Schema Storage" statically in server ARCHIVE_CMAKE_ON= -DWITH_ARCHIVE_STORAGE_ENGINE=1 BLACKHOLE_CMAKE_ON= -DWITH_BLACKHOLE_STORAGE_ENGINE=1 EXAMPLE_CMAKE_ON= -DWITH_EXAMPLE_STORAGE_ENGINE=1 FEDERATED_CMAKE_ON= -DWITH_FEDERATED_STORAGE_ENGINE=1 INNOBASE_CMAKE_ON= -DWITH_INNOBASE_STORAGE_ENGINE=1 PARTITION_CMAKE_ON= -DWITH_PARTITION_STORAGE_ENGINE=1 PERFSCHEMA_CMAKE_ON= -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 OPTIONS_GROUP+= FEATURES OPTIONS_GROUP_FEATURES= PERFSCHM FEATURES_DESC= Default features knobs PERFSCHM_DESC= Enable "Performance Schema" by default (High RAM usage) OPTIONS_DEFAULT+= PERFSCHM PERFSCHM_SUB_LIST+= PERFSCHEMRC="" # todo, likely broken, see # https://dev.mysql.com/doc/refman/8.4/en/source-configuration-options.html PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema" FEDERATED_SUB_LIST+= FEDER="--federated" FEDERATED_SUB_LIST_OFF+= FEDER="" .endif .include CXXFLAGS+= -malign-double .include post-extract: @${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h .if !defined(CLIENT_ONLY) post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample ${MKDIR} ${STAGEDIR}${ETCDIR}/keyring ${MKDIR} ${STAGEDIR}${MY_SECDIR} ${MKDIR} ${STAGEDIR}${MY_TMPDIR} .endif .include diff --git a/databases/mysql84-server/distinfo b/databases/mysql84-server/distinfo index 0da85a689377..aa6bbe6db367 100644 --- a/databases/mysql84-server/distinfo +++ b/databases/mysql84-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1735595165 -SHA256 (mysql-8.4.3.tar.gz) = 7ac9564c478022f73005ff89bbb40f67b381fc06d5518416bdffec75e625b818 -SIZE (mysql-8.4.3.tar.gz) = 465097732 +TIMESTAMP = 1744755957 +SHA256 (mysql-8.4.5.tar.gz) = 53639592a720a719fdfadf2c921b947eac86c06e333202e47667852a5781bd1a +SIZE (mysql-8.4.5.tar.gz) = 478788925 diff --git a/databases/mysql84-server/files/patch-CMakeLists.txt b/databases/mysql84-server/files/patch-CMakeLists.txt index ad5e829a5b73..01e5bdccdeb8 100644 --- a/databases/mysql84-server/files/patch-CMakeLists.txt +++ b/databases/mysql84-server/files/patch-CMakeLists.txt @@ -1,80 +1,80 @@ ---- CMakeLists.txt.orig 2024-09-17 10:40:37 UTC +--- CMakeLists.txt.orig 2025-03-31 07:51:10 UTC +++ CMakeLists.txt -@@ -1870,7 +1870,7 @@ IF(WITH_AUTHENTICATION_LDAP) +@@ -1911,7 +1911,7 @@ IF(WITH_AUTHENTICATION_LDAP) ENDIF() IF(WITH_AUTHENTICATION_LDAP) - IF(LINUX AND KNOWN_CUSTOM_LIBRARIES) + IF(LINUX OR FREEBSD AND KNOWN_CUSTOM_LIBRARIES) # LDAP / SASL / KERBEROS / SSL must all be "system" or "custom", not a mix. IF(WITH_LDAP STREQUAL "system" OR WITH_SASL STREQUAL "system" OR -@@ -1921,6 +1921,7 @@ ENDIF() +@@ -1962,6 +1962,7 @@ ENDIF() ENDIF() ENDIF() +IF(NOT WITHOUT_TOOLS) # Add system/bundled editline. MYSQL_CHECK_EDITLINE() SET(EDITLINE_WARN_GIVEN) -@@ -1931,6 +1932,7 @@ ENDIF() +@@ -1972,6 +1973,7 @@ ENDIF() "You can use -DWITH_EDITLINE=bundled instead." ) ENDIF() +ENDIF(NOT WITHOUT_TOOLS) # Add lz4 library MYSQL_CHECK_LZ4() -@@ -2213,7 +2215,9 @@ ADD_DEPENDENCIES(clang_tidy_prerequisites GenError) +@@ -2254,7 +2256,9 @@ ADD_DEPENDENCIES(clang_tidy_prerequisites GenError) ADD_DEPENDENCIES(clang_tidy_prerequisites protobuf_generated_all) ADD_DEPENDENCIES(clang_tidy_prerequisites GenError) -ADD_SUBDIRECTORY(include) +IF(NOT WITHOUT_CLIENTLIBS) + ADD_SUBDIRECTORY(include) +ENDIF(NOT WITHOUT_CLIENTLIBS) ADD_SUBDIRECTORY(strings) - ADD_SUBDIRECTORY(vio) - ADD_SUBDIRECTORY(mysys) -@@ -2263,12 +2267,15 @@ ENDIF() + ADD_SUBDIRECTORY(extra/unordered_dense) + ADD_SUBDIRECTORY(extra/xxhash) +@@ -2306,12 +2310,15 @@ ENDIF() ADD_SUBDIRECTORY(unittest/mytap/t) ENDIF() -ADD_SUBDIRECTORY(client) +IF(NOT WITHOUT_TOOLS) + ADD_SUBDIRECTORY(client) +ENDIF(NOT WITHOUT_TOOLS) + ADD_SUBDIRECTORY(utilities) -ADD_SUBDIRECTORY(share) ADD_SUBDIRECTORY(libservices) IF(NOT WITHOUT_SERVER) + ADD_SUBDIRECTORY(share) ADD_SUBDIRECTORY(testclients) ADD_SUBDIRECTORY(sql) ENDIF() -@@ -2346,11 +2353,11 @@ ADD_SUBDIRECTORY(scripts) +@@ -2389,11 +2396,11 @@ ADD_SUBDIRECTORY(scripts) # scripts/mysql_config depends on client and server targets loaded above. # It is referenced by some of the directories below, so we insert it here. ADD_SUBDIRECTORY(scripts) +ADD_SUBDIRECTORY(support-files) IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(mysql-test) ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) - ADD_SUBDIRECTORY(support-files) IF(WITH_INTERNAL) ADD_SUBDIRECTORY(internal) ENDIF() -@@ -2377,8 +2384,10 @@ ENDIF() +@@ -2420,8 +2427,10 @@ ENDIF() INCLUDE(fastcov) ENDIF() +IF(FALSE) IF(UNIX) ADD_SUBDIRECTORY(man) +ENDIF() ENDIF() IF(LINUX AND NOT WITHOUT_SERVER) diff --git a/databases/mysql84-server/files/patch-cmake_libutils.cmake b/databases/mysql84-server/files/patch-cmake_libutils.cmake index a96fa8f41fb3..8b8ac035ddf4 100644 --- a/databases/mysql84-server/files/patch-cmake_libutils.cmake +++ b/databases/mysql84-server/files/patch-cmake_libutils.cmake @@ -1,22 +1,22 @@ ---- cmake/libutils.cmake.orig 2024-06-03 11:39:00 UTC +--- cmake/libutils.cmake.orig 2025-03-31 07:51:10 UTC +++ cmake/libutils.cmake -@@ -384,9 +384,6 @@ MACRO(MERGE_LIBRARIES_SHARED TARGET_ARG) +@@ -385,9 +385,6 @@ MACRO(MERGE_LIBRARIES_SHARED TARGET_ARG) ELSE() SET(DESTINATION "${INSTALL_LIBDIR}") ENDIF() - IF(ARG_NAMELINK_SKIP) - SET(INSTALL_ARGS NAMELINK_SKIP) - ENDIF() MYSQL_INSTALL_TARGET(${TARGET} DESTINATION "${DESTINATION}" ${COMP} ${INSTALL_ARGS}) ENDIF() -@@ -642,9 +639,6 @@ FUNCTION(ADD_SHARED_LIBRARY TARGET_ARG) +@@ -643,9 +640,6 @@ FUNCTION(ADD_SHARED_LIBRARY TARGET_ARG) SET(COMP COMPONENT ${ARG_COMPONENT}) ELSE() SET(COMP COMPONENT SharedLibraries) - ENDIF() - IF(ARG_NAMELINK_SKIP) - SET(INSTALL_ARGS NAMELINK_SKIP) ENDIF() MYSQL_INSTALL_TARGET(${TARGET} DESTINATION "${DESTINATION}" ${COMP} ${INSTALL_ARGS}) diff --git a/databases/mysql84-server/files/patch-libs_mysql_serialization_archive.h b/databases/mysql84-server/files/patch-libs_mysql_serialization_archive.h index 9c5c096c2b6b..598054456bc5 100644 --- a/databases/mysql84-server/files/patch-libs_mysql_serialization_archive.h +++ b/databases/mysql84-server/files/patch-libs_mysql_serialization_archive.h @@ -1,19 +1,19 @@ ---- libs/mysql/serialization/archive.h.orig 2024-07-12 19:20:22 UTC +--- libs/mysql/serialization/archive.h.orig 2025-03-31 07:51:10 UTC +++ libs/mysql/serialization/archive.h @@ -81,14 +81,14 @@ class Archive { /// @note To be implemented in Archive_derived_type template static std::size_t get_size(Type &&arg) { -- return Archive_derived_type::template get_size(std::forward(arg)); +- return Archive_derived_type::get_size(std::forward(arg)); + return Archive_derived_type::template get_size<>(std::forward(arg)); } /// @brief Returns archive size - size of data written to the archive /// @return archive size - size of data written to the archive /// @note To be implemented in Archive_derived_type inline std::size_t get_size_written() const { -- return Archive_derived_type::template get_size_written(); +- return Archive_derived_type::get_size_written(); + return Archive_derived_type::template get_size_written<>(); } /// @brief Function returns maximum size of the Type diff --git a/databases/mysql84-server/files/patch-libs_mysql_serialization_serializer__default__impl.hpp b/databases/mysql84-server/files/patch-libs_mysql_serialization_serializer__default__impl.hpp index 43dd9792cd34..82e8aa14e008 100644 --- a/databases/mysql84-server/files/patch-libs_mysql_serialization_serializer__default__impl.hpp +++ b/databases/mysql84-server/files/patch-libs_mysql_serialization_serializer__default__impl.hpp @@ -1,42 +1,37 @@ ---- libs/mysql/serialization/serializer_default_impl.hpp.orig 2024-07-12 19:20:22 UTC +--- libs/mysql/serialization/serializer_default_impl.hpp.orig 2025-03-31 07:51:10 UTC +++ libs/mysql/serialization/serializer_default_impl.hpp @@ -233,7 +233,7 @@ std::size_t Serializer_default: template std::size_t Serializer_default::get_field_size( const Field_type &field) { -- return Archive_concrete_type::template get_size( +- return Archive_concrete_type::get_size( + return Archive_concrete_type::template get_size<>( Field_wrapper(field)); } -@@ -473,7 +473,7 @@ std::size_t Serializer_default: - std::size_t calculated_size = 0; +@@ -474,7 +474,7 @@ std::size_t Serializer_default: bool is_provided = field_definition.run_encode_predicate(); if (is_provided) { -- auto size_id_type = Archive_concrete_type::template get_size( -+ auto size_id_type = Archive_concrete_type::template get_size<>( - create_varlen_field_wrapper(field_id)); + auto size_id_type = +- Archive_concrete_type::get_size(create_varlen_field_wrapper(field_id)); ++ Archive_concrete_type::template get_size<>(create_varlen_field_wrapper(field_id)); calculated_size = get_field_size( field_definition.get_ref()) + -@@ -489,18 +489,18 @@ std::size_t Serializer_default: - bool skip_id) { - std::size_t serializable_overhead_type = 0; - if (skip_id == false) { -- serializable_overhead_type = Archive_concrete_type::template get_size( -+ serializable_overhead_type = Archive_concrete_type::template get_size<>( - create_varlen_field_wrapper(field_id)); + size_id_type; +@@ -493,14 +493,14 @@ std::size_t Serializer_default: + Archive_concrete_type::get_size(create_varlen_field_wrapper(field_id)); } auto serializable_size = serializable.template get_size_internal(); -- auto serializable_overhead_size = Archive_concrete_type::template get_size( +- auto serializable_overhead_size = Archive_concrete_type::get_size( + auto serializable_overhead_size = Archive_concrete_type::template get_size<>( create_varlen_field_wrapper(serializable_size)); Field_id_type last_non_ignorable_field_id = find_last_non_ignorable_field_id(serializable); auto serializable_overhead_last_non_ignorable_field_id = -- Archive_concrete_type::template get_size( +- Archive_concrete_type::get_size( + Archive_concrete_type::template get_size<>( create_varlen_field_wrapper(last_non_ignorable_field_id)); return serializable_overhead_type + serializable_overhead_size + serializable_overhead_last_non_ignorable_field_id + serializable_size; diff --git a/databases/mysql84-server/files/patch-libs_mysql_serialization_serializer__impl.hpp b/databases/mysql84-server/files/patch-libs_mysql_serialization_serializer__impl.hpp index da31e03eb489..985efd08e002 100644 --- a/databases/mysql84-server/files/patch-libs_mysql_serialization_serializer__impl.hpp +++ b/databases/mysql84-server/files/patch-libs_mysql_serialization_serializer__impl.hpp @@ -1,22 +1,20 @@ ---- libs/mysql/serialization/serializer_impl.hpp.orig 2024-07-12 19:20:22 UTC +--- libs/mysql/serialization/serializer_impl.hpp.orig 2025-03-31 07:51:10 UTC +++ libs/mysql/serialization/serializer_impl.hpp -@@ -51,8 +51,8 @@ Serializer::get +@@ -51,7 +51,7 @@ Serializer::get Serializer::get_size_field_def( Field_id_type field_id, const Field_definition &field_definition) { -- return Serializer_derived_type::template get_size_field_def(field_id, -- field_definition); -+ return Serializer_derived_type::template get_size_field_def<>( -+ field_id, field_definition); +- return Serializer_derived_type::get_size_field_def(field_id, ++ return Serializer_derived_type::template get_size_field_def<>(field_id, + field_definition); } - template @@ -61,7 +61,7 @@ Serializer::get Serializer::get_size_serializable( Field_id_type field_id, const Serializable_concrete_type &serializable, bool skip_id) { -- return Serializer_derived_type::template get_size_serializable( -+ return Serializer_derived_type::template get_size_serializable<>( - field_id, serializable, skip_id); +- return Serializer_derived_type::get_size_serializable(field_id, serializable, ++ return Serializer_derived_type::template get_size_serializable<>(field_id, serializable, + skip_id); } diff --git a/databases/mysql84-server/files/patch-sql_mdl__context__backup.h b/databases/mysql84-server/files/patch-sql_mdl__context__backup.h deleted file mode 100644 index fcb8790f13db..000000000000 --- a/databases/mysql84-server/files/patch-sql_mdl__context__backup.h +++ /dev/null @@ -1,11 +0,0 @@ ---- sql/mdl_context_backup.h.orig 2024-07-12 19:20:22 UTC -+++ sql/mdl_context_backup.h -@@ -47,7 +47,7 @@ class MDL_context_backup_manager { - /** - Key for uniquely identifying MDL_context in the MDL_context_backup map. - */ -- typedef std::basic_string MDL_context_backup_key; -+ typedef std::vector MDL_context_backup_key; - - class MDL_context_backup; - diff --git a/databases/mysql84-server/files/patch-sql_mysqld.cc b/databases/mysql84-server/files/patch-sql_mysqld.cc index ee83e9bcd358..c0de00fb0e3f 100644 --- a/databases/mysql84-server/files/patch-sql_mysqld.cc +++ b/databases/mysql84-server/files/patch-sql_mysqld.cc @@ -1,11 +1,11 @@ ---- sql/mysqld.cc.orig 2024-04-10 06:26:28 UTC +--- sql/mysqld.cc.orig 2025-03-31 07:51:10 UTC +++ sql/mysqld.cc -@@ -7000,7 +7000,7 @@ static PSI_memory_key key_memory_openssl = PSI_NOT_INS +@@ -7001,7 +7001,7 @@ static PSI_memory_key key_memory_openssl = PSI_NOT_INS static PSI_memory_key key_memory_openssl = PSI_NOT_INSTRUMENTED; -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) #define FILE_LINE_ARGS #else #define FILE_LINE_ARGS , const char *, int diff --git a/databases/mysql84-server/files/patch-sql_range__optimizer_index__range__scan__plan.cc b/databases/mysql84-server/files/patch-sql_range__optimizer_index__range__scan__plan.cc deleted file mode 100644 index 276862229fcf..000000000000 --- a/databases/mysql84-server/files/patch-sql_range__optimizer_index__range__scan__plan.cc +++ /dev/null @@ -1,39 +0,0 @@ ---- sql/range_optimizer/index_range_scan_plan.cc.orig 2024-07-12 19:20:22 UTC -+++ sql/range_optimizer/index_range_scan_plan.cc -@@ -1016,11 +1016,11 @@ static bool null_part_in_key(KEY_PART *key_part, const - return false; - } - --// TODO(sgunders): This becomes a bit simpler with C++20's string_view --// constructors. --static inline std::basic_string_view make_string_view(const uchar *start, -- const uchar *end) { -- return {start, static_cast(end - start)}; -+static inline bool equal(const uchar *start1, const uchar *end1, -+ const uchar *start2, const uchar *end2) { -+ auto diff1 = end1 - start1; -+ auto diff2 = end2 - start2; -+ return diff1 == diff2 && memcmp(start1, start2, diff1) == 0; - } - - /** -@@ -1083,8 +1083,7 @@ static bool get_ranges_from_tree_given_base( - node->next_key_part->type == SEL_ROOT::Type::KEY_RANGE && - node->next_key_part->root->part == part + 1) { - if (node->min_flag == 0 && node->max_flag == 0 && -- make_string_view(min_key, tmp_min_key) == -- make_string_view(max_key, tmp_max_key)) { -+ equal(min_key, tmp_min_key, max_key, tmp_max_key)) { - // This range was an equality predicate, and we have more - // keyparts to scan, so use its range as a base for ranges on - // the next keypart(s). E.g. if we have (a = 3) on this keypart, -@@ -1160,8 +1159,7 @@ static bool get_ranges_from_tree_given_base( - else - flag |= NO_MAX_RANGE; - } -- if (flag == 0 && make_string_view(base_min_key, tmp_min_key) == -- make_string_view(base_max_key, tmp_max_key)) { -+ if (flag == 0 && equal(base_min_key, tmp_min_key, base_max_key, tmp_max_key)) { - flag |= EQ_RANGE; - /* - Note that keys which are extended with PK parts have no diff --git a/databases/mysql84-server/files/patch-sql_stream__cipher.h b/databases/mysql84-server/files/patch-sql_stream__cipher.h deleted file mode 100644 index fcad3c5e4079..000000000000 --- a/databases/mysql84-server/files/patch-sql_stream__cipher.h +++ /dev/null @@ -1,19 +0,0 @@ ---- sql/stream_cipher.h.orig 2024-07-12 19:20:22 UTC -+++ sql/stream_cipher.h -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - /** - @file stream_cipher.h -@@ -35,7 +36,7 @@ - binary log files. - */ - --typedef std::basic_string Key_string; -+typedef std::vector Key_string; - - /** - @class Stream_cipher diff --git a/databases/mysql84-server/files/patch-storage_innobase_include_srv0mon.h b/databases/mysql84-server/files/patch-storage_innobase_include_srv0mon.h index a0279de2a126..1bbd2e73f2a0 100644 --- a/databases/mysql84-server/files/patch-storage_innobase_include_srv0mon.h +++ b/databases/mysql84-server/files/patch-storage_innobase_include_srv0mon.h @@ -1,13 +1,13 @@ ---- storage/innobase/include/srv0mon.h.orig 2024-04-10 06:26:28 UTC +--- storage/innobase/include/srv0mon.h.orig 2025-03-31 07:51:10 UTC +++ storage/innobase/include/srv0mon.h @@ -41,6 +41,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, /* Required for FreeBSD so that INT64_MAX is defined. */ #define __STDC_LIMIT_MACROS #endif /* __STDC_LIMIT_MACROS */ +#ifdef __DragonFly__ +/* The hack above doen't work for dragonfly, stdint.h already imported */ +#include +#endif #include - + #include diff --git a/databases/mysql84-server/files/patch-unittest_gunit_binlogevents_transaction__compression-t.cc b/databases/mysql84-server/files/patch-unittest_gunit_binlogevents_transaction__compression-t.cc deleted file mode 100644 index d77f946e2276..000000000000 --- a/databases/mysql84-server/files/patch-unittest_gunit_binlogevents_transaction__compression-t.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- unittest/gunit/binlogevents/transaction_compression-t.cc.orig 2024-07-12 19:20:22 UTC -+++ unittest/gunit/binlogevents/transaction_compression-t.cc -@@ -49,7 +49,7 @@ class TransactionPayloadCompressionTest : public ::tes - using Managed_buffer_t = Decompressor_t::Managed_buffer_t; - using Size_t = Decompressor_t::Size_t; - using Char_t = Decompressor_t::Char_t; -- using String_t = std::basic_string; -+ using String_t = std::vector; - using Decompress_status_t = - mysql::binlog::event::compression::Decompress_status; - using Compress_status_t = mysql::binlog::event::compression::Compress_status;