AIX workaround for GCC TOC bug

2c724762 · Etienne Guesnet · Daniel Black · 77d7de8d · 2c724762 · 2c724762
Commit 2c724762 authored Sep 11, 2020 by Etienne Guesnet Committed by Daniel Black Dec 16, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

include/mysql/psi/psi_memory.h include/mysql/psi/psi_memory.h +4 -0

sql/log_event.cc sql/log_event.cc +2 -0

No files found.
--- 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

--- 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;