git: e481ca786b0d - main - databases/mysql80-server: fix build for i386

The branch main has been updated by joneum:

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

commit e481ca786b0daca6c4252fa065154aef0ab328bd
Author:     Jochen Neumeister <joneum@FreeBSD.org>
AuthorDate: 2024-08-31 08:11:30 +0000
Commit:     Jochen Neumeister <joneum@FreeBSD.org>
CommitDate: 2024-08-31 08:12:55 +0000

    databases/mysql80-server: fix build for i386
    
    --- storage/innobase/CMakeFiles/innodb_zipdecompress.dir/all ---
    /usr/tmp/net/hal/z/SRC/FreeBSD/ports/MBi/main/databases/mysql80-server/work/mysql-8.0.39/storage/innobase/include/detail/ut/aligned_alloc.h:466:39:
    error: no member named 'meta_1' in
    'ut::detail::Aligned_alloc_metadata<unsigned int, unsigned int>'
      466 |     auto offset = allocator_metadata::meta_1(data);
          |                   ~~~~~~~~~~~~~~~~~~~~^
    /usr/tmp/net/hal/z/SRC/FreeBSD/ports/MBi/main/databases/mysql80-server/work/mysql-8.0.39/storage/innobase/include/detail/ut/aligned_alloc.h:593:25:
    error: no member named 'meta_1' in
    'ut::detail::Aligned_alloc_metadata<unsigned int, unsigned int>'
      593 |     allocator_metadata::meta_1(ret.first, ret.second);
          |     ~~~~~~~~~~~~~~~~~~~~^
    /usr/tmp/net/hal/z/SRC/FreeBSD/ports/MBi/main/databases/mysql80-server/work/mysql-8.0.39/storage/innobase/include/detail/ut/aligned_alloc.h:594:25:
    error: no member named 'meta_2' in
    'ut::detail::Aligned_alloc_metadata<unsigned int, unsigned int>'
      594 |     allocator_metadata::meta_2(ret.first, size);
          |     ~~~~~~~~~~~~~~~~~~~~^
    /usr/tmp/net/hal/z/SRC/FreeBSD/ports/MBi/main/databases/mysql80-server/work/mysql-8.0.39/storage/innobase/include/detail/ut/aligned_alloc.h:655:32:
    error: no member named 'meta_2' in
    'ut::detail::Aligned_alloc_metadata<unsigned int, unsigned int>'
      655 |     return
    allocator_metadata::meta_2(pfs_metadata::deduce_pfs_meta(data));
          |            ~~~~~~~~~~~~~~~~~~~~^
    /usr/tmp/net/hal/z/SRC/FreeBSD/ports/MBi/main/databases/mysql80-server/work/mysql-8.0.39/storage/innobase/include/detail/ut/aligned_alloc.h:668:39:
    error: no member named 'meta_1' in
    'ut::detail::Aligned_alloc_metadata<unsigned int, unsigned int>'
      668 |     auto offset = allocator_metadata::meta_1(pfs_meta);
          |                   ~~~~~~~~~~~~~~~~~~~~^
    
    PR:     280541
    Sponsored by:   Netzkommune GmbH
---
 .../patch-storage_innobase_include_details_ut_aligned_alloc.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/databases/mysql80-server/files/patch-storage_innobase_include_details_ut_aligned_alloc.h b/databases/mysql80-server/files/patch-storage_innobase_include_details_ut_aligned_alloc.h
new file mode 100644
index 000000000000..2175a4398307
--- /dev/null
+++ b/databases/mysql80-server/files/patch-storage_innobase_include_details_ut_aligned_alloc.h
@@ -0,0 +1,11 @@
+--- storage/innobase/include/detail/ut/aligned_alloc.h.orig	2024-08-29 18:34:56.237736000 +0200
++++ storage/innobase/include/detail/ut/aligned_alloc.h	2024-08-29 18:35:34.091577000 +0200
+@@ -55,7 +55,7 @@ struct Aligned_alloc_impl {
+       whatever arbitrary data. See Aligned_alloc and Aligned_alloc_arr for
+       exemplary usages of it.
+    */
+-  static constexpr uint32_t metadata_size = alignof(max_align_t);
++  static constexpr uint32_t metadata_size = alignof(max_align_t) < (2 * alignof(uint32_t)) ? (2 * alignof(uint32_t)) : alignof(max_align_t);
+ 
+   /** Alias that we will be using to denote ptr to DATA segment. */
+   using data_segment_ptr = void *;