mirror of
https://git.freebsd.org/ports.git
synced 2025-05-03 12:06:39 -04:00
9832739877
As noted in the libc++ 19 release notes [1], std::char_traits<> is now
only provided for char, char8_t, char16_t, char32_t and wchar_t, and any
instantiation for other types will fail.
This causes databases/mysql84-server to fail to compile with clang 19
and libc++ 19, resulting in errors similar to:
/usr/include/c++/v1/string:820:42: error: implicit instantiation of
undefined template 'std::char_traits<unsigned char>'
820 | static_assert(is_same<_CharT, typename
traits_type::char_type>::value,
| ^
/wrkdirs/usr/ports/databases/mysql84-client/work/mysql-8.4.2/sql/rpl_log_encryption.h:821:14:
note: in instantiation of template class 'std::basic_string<unsigned
char>' requested here
821 | Key_string m_encrypted_password;
| ^
/usr/include/c++/v1/__fwd/string.h:23:29: note: template is declared
here
23 | struct _LIBCPP_TEMPLATE_VIS char_traits;
| ^
`Key_string` is defined as `std::basic_string<unsigned char>`, which is
no longer possible. So redefine it as a `std::vector<unsigned char>`
instead.
This requires only a few small adjustments in other places: replacing
the `length()` method with the equivalent `size()` method, and adjusting
the arguments for the `assign()` method, which for `std::vector` takes a
begin and end iterator, instead of a begin iterator and a size.
Another issue is that clang 19 now implements CWG 96 [2], which requires
a template argument list after a 'template' keyword, resulting in errors
similar to:
/wrkdirs/usr/ports/databases/mysql84-client/work/mysql-8.4.2/libs/mysql/serialization/archive.h:84:43:
error: a template argument list is expected after a name prefixed by the
template keyword [-Wmissing-template-arg-list-after-template-kw]
84 | return Archive_derived_type::template
get_size(std::forward<Type>(arg));
| ^
/wrkdirs/usr/ports/databases/mysql84-client/work/mysql-8.4.2/libs/mysql/serialization/archive.h:91:43:
error: a template argument list is expected after a name prefixed by the
template keyword [-Wmissing-template-arg-list-after-template-kw]
91 | return Archive_derived_type::template
get_size_written();
| ^
This requires a number of adjustments to various template invocations.
[1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals
[2] https://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#96
PR: 280695
Sponsored by: Netzkommune GmbH
36 lines
1.5 KiB
C++
36 lines
1.5 KiB
C++
--- sql/mdl_context_backup.cc.orig 2024-07-12 19:20:22 UTC
|
|
+++ sql/mdl_context_backup.cc
|
|
@@ -160,7 +160,7 @@ bool MDL_context_backup_manager::create_backup(const M
|
|
DBUG_TRACE;
|
|
|
|
try {
|
|
- MDL_context_backup_key key_obj(key, keylen);
|
|
+ MDL_context_backup_key key_obj(key, key + keylen);
|
|
|
|
/*
|
|
Since this method is called as part of THD cleaning up, every XA
|
|
@@ -193,7 +193,7 @@ bool MDL_context_backup_manager::create_backup(MDL_req
|
|
|
|
bool result = false;
|
|
try {
|
|
- MDL_context_backup_key key_obj(key, keylen);
|
|
+ MDL_context_backup_key key_obj(key, key + keylen);
|
|
/*
|
|
Check for presence a record with specified key in the collection of
|
|
MDL_context_backup elements. It is ok to already have a record with
|
|
@@ -239,7 +239,7 @@ bool MDL_context_backup_manager::restore_backup(MDL_co
|
|
|
|
MUTEX_LOCK(guard, &m_LOCK_mdl_context_backup);
|
|
|
|
- auto result = m_backup_map.find(MDL_context_backup_key(key, keylen));
|
|
+ auto result = m_backup_map.find(MDL_context_backup_key(key, key + keylen));
|
|
if (result != m_backup_map.end()) {
|
|
element = result->second.get();
|
|
res = mdl_context->clone_tickets(element->get_context(), MDL_TRANSACTION);
|
|
@@ -252,5 +252,5 @@ void MDL_context_backup_manager::delete_backup(const u
|
|
const size_t keylen) {
|
|
DBUG_TRACE;
|
|
MUTEX_LOCK(guard, &m_LOCK_mdl_context_backup);
|
|
- m_backup_map.erase(MDL_context_backup_key(key, keylen));
|
|
+ m_backup_map.erase(MDL_context_backup_key(key, key + keylen));
|
|
}
|