Merge 10.3 into 10.3-instant

The tree state corresponds to the squashed
commit a4948daf in the 10.3 branch.

This branch is preserved for future reference.

cmake/os/Linux.cmake

@@ -34,8 +34,8 @@ ENDFOREACH()
 
 # Ensure we have clean build for shared libraries
 # without unresolved symbols
-# Not supported with AddressSanitizer
-IF(NOT WITH_ASAN)
+# Not supported with AddressSanitizer and ThreadSanitizer
+IF(NOT WITH_ASAN AND NOT WITH_TSAN)
   SET(LINK_FLAG_NO_UNDEFINED "-Wl,--no-undefined")
 ENDIF()
 

cmake/plugin.cmake

@@ -208,7 +208,7 @@ MACRO(MYSQL_ADD_PLUGIN)
       ELSEIF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
         TARGET_LINK_LIBRARIES (${target} mysqld)
       ENDIF()
-    ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT WITH_ASAN)
+    ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT WITH_ASAN AND NOT WITH_TSAN)
       TARGET_LINK_LIBRARIES (${target} "-Wl,--no-undefined")
     ENDIF()