well, the attached patch works the many changes are because of poor source code quality with a wild mix of spaces and tabs for indents while any of my texteditors or IDE's convert tabs to spaces at save... Am 29.09.2017 um 13:28 schrieb Reindl Harald:
Am 29.09.2017 um 11:01 schrieb Sergei Golubchik:
Do you expect this diff to apply to 10.2.10 too? The short one could be:
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -283,10 +283,10 @@ IF(APPLE) ENDIF() ENDIF()
-IF(NOT WITHOUT_DYNAMIC_PLUGINS) IF(NOT MSVC) SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE) ENDIF() +IF(NOT WITHOUT_DYNAMIC_PLUGINS) GET_TARGET_PROPERTY(mysqld_link_flags mysqld LINK_FLAGS) IF(NOT mysqld_link_flags) SET(mysqld_link_flags)
besides that the patch-command don't like that copy&paste from a inline mail i don't see what that changes
-IF(NOT WITHOUT_DYNAMIC_PLUGINS) +IF(NOT WITHOUT_DYNAMIC_PLUGINS) ______________________
IF(APPLE) # Add CoreServices framework since some dloadable plugins may need it FIND_LIBRARY(CORESERVICES NAMES CoreServices) IF(CORESERVICES) TARGET_LINK_LIBRARIES(mysqld ${CORESERVICES}) ENDIF() ENDIF()
IF(NOT WITHOUT_DYNAMIC_PLUGINS) IF(NOT MSVC) SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE) ENDIF() GET_TARGET_PROPERTY(mysqld_link_flags mysqld LINK_FLAGS) IF(NOT mysqld_link_flags) SET(mysqld_link_flags) ENDIF() IF (MINGW OR CYGWIN) SET_TARGET_PROPERTIES(mysqld PROPERTIES LINK_FLAGS "${mysqld_link_flags} -Wl,--export-all-symbols") ENDIF() IF(MSVC) SET_TARGET_PROPERTIES(mysqld PROPERTIES LINK_FLAGS "${mysqld_link_flags} \"${MYSQLD_EXP}\"") ADD_DEPENDENCIES(mysqld gen_mysqld_lib) ENDIF() ENDIF(NOT WITHOUT_DYNAMIC_PLUGINS)