Attachment 13444 Details for Bug 46440 – патч про int64_t

[patch] патч про int64_t

0002-Fixed-compilation-errors-due-to-missing-integer-type.patch (text/plain), 5.52 KB, created by Alexey Sheplyakov on 2023-06-08 16:01:47 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Alexey Sheplyakov

Created: 2023-06-08 16:01:47 MSK

Size: 5.52 KB

patch

obsolete

>From 540497da018d79700877a227114d7e2e4d25280a Mon Sep 17 00:00:00 2001
>From: Alexey Sheplyakov <asheplyakov@basealt.ru>
>Date: Thu, 8 Jun 2023 08:13:57 +0000
>Subject: [PATCH 2/3] Fixed compilation errors due to missing integer types
> declarations
>
>Added missing #include <cstdint> to fix the following errors:
>
>/usr/src/RPM/BUILD/MySQL-8.0.30/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_logging.h:271:27: error: 'in
>t64_t' is not a member of 'std'; did you mean 'int64_t'?
>  271 |   static std::atomic<std::int64_t> m_debug_options;
>      |                           ^~~~~~~
>In file included from /usr/include/sys/types.h:155,
>                 from /usr/include/stdlib.h:395,
>                 from /usr/include/c++/13/cstdlib:79,
>                 from /usr/include/c++/13/bits/stl_algo.h:71,
>                 from /usr/include/c++/13/algorithm:61,
>                 from /usr/src/RPM/BUILD/MySQL-8.0.30/plugin/group_replication/libmysqlgcs/src/interface/gcs_logging.cc:23:
>/usr/include/bits/stdint-intn.h:27:19: note: 'int64_t' declared here
>   27 | typedef __int64_t int64_t;
>      |                   ^~~~~~~
>/usr/src/RPM/BUILD/MySQL-8.0.30/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_logging.h:271:34: error: template argument 1 is invalid
>  271 |   static std::atomic<std::int64_t> m_debug_options;
>/usr/src/RPM/BUILD/MySQL-8.0.30/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_group_management_interface.h:51:11: error: 'uint32_t' does not name a type
>   51 |   virtual uint32_t get_minimum_write_concurrency() const = 0;
>      |           ^~~~~~~~
>/usr/src/RPM/BUILD/MySQL-8.0.30/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_group_management_interface.h:28:1: note: 'uint32_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
>   27 | #include "plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_types.h"
>  +++ |+#include <cstdint>
>   28 |
>/usr/src/RPM/BUILD/MySQL-8.0.30/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_group_management_interface.h:56:11: error: 'uint32_t' does not name a type
>   56 |   virtual uint32_t get_maximum_write_concurrency() const = 0;
>      |           ^~~~~~~~
>/usr/src/RPM/BUILD/MySQL-8.0.30/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_group_management_interface.h:56:11: note: 'uint32_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
>/usr/src/RPM/BUILD/MySQL-8.0.30/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_group_management_interface.h:69:7: error: 'uint32_t' has not been declared
>   69 |       uint32_t &write_concurrency) const = 0;
>      |       ^~~~~~~~
>/usr/src/RPM/BUILD/MySQL-8.0.30/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_group_management_interface.h:86:48: error: 'uint32_t' has not been declared
>   86 |   virtual enum_gcs_error set_write_concurrency(uint32_t write_concurrency) = 0;
>      |                                                ^~~~~~~~
>---
> libbinlogevents/include/gtids/global.h                         | 3 ++-
> .../libmysqlgcs/include/mysql/gcs/gcs_types.h                  | 1 +
> .../group_replication/libmysqlgcs/src/interface/gcs_logging.cc | 1 +
> plugin/x/src/interface/document_id_generator.h                 | 1 +
> sql/dd/impl/sdi.h                                              | 1 +
> 5 files changed, 6 insertions(+), 1 deletion(-)
>
>diff --git a/libbinlogevents/include/gtids/global.h b/libbinlogevents/include/gtids/global.h
>index 7d388f58e2c..3a61c43f6d5 100644
>--- a/libbinlogevents/include/gtids/global.h
>+++ b/libbinlogevents/include/gtids/global.h
>@@ -25,6 +25,7 @@
> 
> #include <set>
> #include <sstream>
>+#include <cstdint>
> #include "libbinlogevents/include/uuid.h"
> 
> namespace binary_log::gtids {
>@@ -34,4 +35,4 @@ typedef binary_log::Uuid Uuid;
> 
> }  // namespace binary_log::gtids
> 
>-#endif
>\ No newline at end of file
>+#endif
>diff --git a/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_types.h b/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_types.h
>index 3fe0ec73520..c38ec7e57cc 100644
>--- a/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_types.h
>+++ b/plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_types.h
>@@ -26,6 +26,7 @@
> #include <map>
> #include <string>
> #include <vector>
>+#include <cstdint>
> 
> /* Helper definitions for types used in this interface */
> typedef unsigned char uchar;
>diff --git a/plugin/group_replication/libmysqlgcs/src/interface/gcs_logging.cc b/plugin/group_replication/libmysqlgcs/src/interface/gcs_logging.cc
>index 004f7fffcde..5c769e621b3 100644
>--- a/plugin/group_replication/libmysqlgcs/src/interface/gcs_logging.cc
>+++ b/plugin/group_replication/libmysqlgcs/src/interface/gcs_logging.cc
>@@ -24,6 +24,7 @@
> #include <cassert>
> #include <sstream>
> #include <string>
>+#include <cstdint>
> 
> #include "plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_logging.h"
> 
>diff --git a/plugin/x/src/interface/document_id_generator.h b/plugin/x/src/interface/document_id_generator.h
>index 15ba85bf0da..7b2cdde9086 100644
>--- a/plugin/x/src/interface/document_id_generator.h
>+++ b/plugin/x/src/interface/document_id_generator.h
>@@ -27,6 +27,7 @@
> 
> #include <cstdio>
> #include <string>
>+#include <cstdint>
> 
> namespace xpl {
> namespace iface {
>diff --git a/sql/dd/impl/sdi.h b/sql/dd/impl/sdi.h
>index 66514452fa4..c03199220b5 100644
>--- a/sql/dd/impl/sdi.h
>+++ b/sql/dd/impl/sdi.h
>@@ -24,6 +24,7 @@
> #define DD__SDI_INCLUDED
> 
> #include <functional>
>+#include <cstdint>
> #include "my_compiler.h"
> #include "sql/dd/sdi_fwd.h"      // RJ_Document
> #include "sql/dd/string_type.h"  // dd::String_type
>-- 
>2.33.3
>

Actions: View | Diff

Attachments on bug 46440: 13443 | 13444