--- ./cmake/maintainer.cmake.orig	2020-01-27 17:14:02 +0100
+++ ./cmake/maintainer.cmake	2020-01-27 17:14:20 +0100
@@ -158,10 +158,10 @@
 ENDIF()
 
 # Turn on Werror (warning => error) when using maintainer mode.
-IF(MYSQL_MAINTAINER_MODE)
-  STRING_APPEND(MY_C_WARNING_FLAGS   " -Werror")
-  STRING_APPEND(MY_CXX_WARNING_FLAGS " -Werror")
-ENDIF()
+#IF(MYSQL_MAINTAINER_MODE)
+#  STRING_APPEND(MY_C_WARNING_FLAGS   " -Werror")
+#  STRING_APPEND(MY_CXX_WARNING_FLAGS " -Werror")
+#ENDIF()
 
 # Set warning flags for gcc/g++/clang/clang++
 IF(MY_COMPILER_IS_GNU_OR_CLANG)
--- ./include/my_thread.h.orig	2020-01-27 13:33:37 +0100
+++ ./include/my_thread.h	2020-01-27 13:35:28 +0100
@@ -161,7 +161,11 @@
                      my_start_routine func, void *arg);
 int my_thread_join(my_thread_handle *thread, void **value_ptr);
 int my_thread_cancel(my_thread_handle *thread);
-void my_thread_exit(void *value_ptr) MY_ATTRIBUTE((noreturn));
+#ifndef _AIX
+  void my_thread_exit(void *value_ptr) MY_ATTRIBUTE((noreturn));
+#else
+  void my_thread_exit(void *value_ptr);
+#endif
 
 extern bool my_thread_global_init();
 extern void my_thread_global_reinit();
--- ./sql/CMakeLists.txt.orig	2020-01-29 10:47:29 +0100
+++ ./sql/CMakeLists.txt	2020-01-29 10:47:12 +0100
@@ -579,6 +582,10 @@
   ${MYSQL_SERVER_SUB_COMPONENT_SOURCES}
 )
 
+IF(CMAKE_SYSTEM_NAME MATCHES AIX)
+  set_source_files_properties(sql_parse.cc PROPERTIES COMPILE_FLAGS -DDBUG_OFF)
+ENDIF()
+
 # BISON_TARGET(<Name> <YaccInput> <CodeOutput>
 #              [COMPILE_FLAGS <flags>]
 #              [DEFINES_FILE <file>]