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,5 +1,5 @@ PORTNAME= mysql -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= 84-client COMMENT= Multithreaded SQL database (client) 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,6 +1,6 @@ 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 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-libs_mysql_serialization_archive.h b/databases/mysql84-server/files/patch-libs_mysql_serialization_archive.h index 9c5c096c2b6b..8f9be7bed6c8 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 +--- libs/mysql/serialization/archive.h.orig 2025-04-16 11:03:05.803394000 +0200 ++++ libs/mysql/serialization/archive.h 2025-04-16 11:04:41.941444000 +0200 @@ -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::template get_size<>(std::forward(arg)); +- return Archive_derived_type::get_size(std::forward(arg)); ++ return Archive_derived_type::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::template get_size_written<>(); +- return Archive_derived_type::get_size_written(); ++ return Archive_derived_type::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..c567b21c0e78 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 +--- libs/mysql/serialization/serializer_default_impl.hpp.orig 2025-04-16 11:53:54.176430000 +0200 ++++ libs/mysql/serialization/serializer_default_impl.hpp 2025-04-16 12:04:00.212267000 +0200 @@ -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::template get_size<>( +- return Archive_concrete_type::get_size( ++ return Archive_concrete_type::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::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::template get_size<>( +- auto serializable_overhead_size = Archive_concrete_type::get_size( ++ auto serializable_overhead_size = Archive_concrete_type::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::template get_size<>( +- Archive_concrete_type::get_size( ++ Archive_concrete_type::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..9515cd3c9017 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 -@@ -51,8 +51,8 @@ Serializer::get +--- libs/mysql/serialization/serializer_impl.hpp.orig 2025-04-16 12:14:53.676819000 +0200 ++++ libs/mysql/serialization/serializer_impl.hpp 2025-04-16 12:20:34.827106000 +0200 +@@ -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::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::get_size_serializable<>(field_id, serializable, + skip_id); } diff --git a/databases/mysql84-server/files/patch-sql_stream__cipher.h b/databases/mysql84-server/files/patch-sql_stream__cipher.h index fcad3c5e4079..a89d5726743a 100644 --- a/databases/mysql84-server/files/patch-sql_stream__cipher.h +++ b/databases/mysql84-server/files/patch-sql_stream__cipher.h @@ -1,19 +1,19 @@ ---- sql/stream_cipher.h.orig 2024-07-12 19:20:22 UTC -+++ sql/stream_cipher.h +--- sql/stream_cipher.h.orig 2025-04-16 13:39:59.557410000 +0200 ++++ sql/stream_cipher.h 2025-04-16 13:41:37.384735000 +0200 @@ -27,6 +27,7 @@ #include #include #include +#include - /** - @file stream_cipher.h -@@ -35,7 +36,7 @@ - binary log files. + #include "my_char_traits.h" + +@@ -38,7 +39,7 @@ using Key_string = */ --typedef std::basic_string Key_string; -+typedef std::vector Key_string; + using Key_string = +- std::basic_string>; ++ std::vector>; /** @class Stream_cipher