From 2c7247622adbd8ac45e739be779b596ea2530fd3 Mon Sep 17 00:00:00 2001 From: Etienne Guesnet Date: Fri, 11 Sep 2020 16:02:58 +0200 Subject: [PATCH] AIX workaround for GCC TOC bug --- include/mysql/psi/psi_memory.h | 4 ++++ sql/log_event.cc | 2 ++ 2 files changed, 6 insertions(+) diff --git a/include/mysql/psi/psi_memory.h b/include/mysql/psi/psi_memory.h index bbe2be32a29..c019c9cd410 100644 --- a/include/mysql/psi/psi_memory.h +++ b/include/mysql/psi/psi_memory.h @@ -138,6 +138,10 @@ typedef void (*memory_free_v1_t) /** @} (end of group Group_PSI_v1) */ +#ifdef _AIX +PSI_memory_key key_memory_log_event; +#endif + #endif /* HAVE_PSI_1 */ #ifdef HAVE_PSI_2 diff --git a/sql/log_event.cc b/sql/log_event.cc index 0388a2b19b1..7d1a52609e2 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -56,7 +56,9 @@ #define my_b_write_string(A, B) my_b_write((A), (uchar*)(B), (uint) (sizeof(B) - 1)) +#ifndef _AIX PSI_memory_key key_memory_log_event; +#endif PSI_memory_key key_memory_Incident_log_event_message; PSI_memory_key key_memory_Rows_query_log_event_rows_query;