summaryrefslogtreecommitdiff
path: root/sql/CMakeLists.txt
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2023-01-31 09:33:58 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2023-01-31 09:33:58 +0100
commitb923b80cfd8628ef973019bf3dba76dda8d940c4 (patch)
tree5511aaddb3b3a750cdca5c12906c7ccd58e0b628 /sql/CMakeLists.txt
parentcea50896d2ea0d18924d92d62a7ec1607d55e509 (diff)
parentc3a5cf2b5bb0c0e1623a0ddc8e3d49557f35e800 (diff)
downloadmariadb-git-b923b80cfd8628ef973019bf3dba76dda8d940c4.tar.gz
Merge branch '10.6' into 10.7
Diffstat (limited to 'sql/CMakeLists.txt')
-rw-r--r--sql/CMakeLists.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index c7b6e7fb4ff..2f313bfd4c8 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -231,6 +231,15 @@ FOREACH(se aria partition perfschema sql_sequence wsrep)
ENDIF()
ENDFOREACH()
+IF(VISIBILITY_HIDDEN_FLAG AND TARGET partition AND WITH_UBSAN)
+ # the spider plugin needs some partition symbols from inside mysqld
+ # when built with ubsan, in which case we need to remove
+ # -fvisibility=hidden from partition
+ GET_TARGET_PROPERTY(f partition COMPILE_FLAGS)
+ STRING(REPLACE "${VISIBILITY_HIDDEN_FLAG}" "" f ${f})
+ SET_TARGET_PROPERTIES(partition PROPERTIES COMPILE_FLAGS "${f}")
+ENDIF()
+
IF(WIN32)
SET(MYSQLD_SOURCE main.cc message.rc)
ELSE()