mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
0e472236ce
On OS X with clang 7.3.0 running any test as embedded crashes. As libfeedback was not compiled with embedded, we had 2 notions of THD, with different number of members. When calling inline functions defined in sql_class.h, the functions were defined for 1 THD but called on an object that is different. This resulted in erroneous data being returned and shortly after, a crash within the alloc_query() function. Recompile the feedback plugin for the embedded server specifically to not have such symbol conflicts.
23 lines
585 B
CMake
23 lines
585 B
CMake
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql
|
|
${PCRE_INCLUDES}
|
|
${SSL_INCLUDE_DIRS})
|
|
|
|
SET(FEEDBACK_SOURCES feedback.cc sender_thread.cc
|
|
url_base.cc url_http.cc utils.cc)
|
|
|
|
ADD_DEFINITIONS(${SSL_DEFINES})
|
|
|
|
INCLUDE (CheckIncludeFiles)
|
|
CHECK_INCLUDE_FILES (netdb.h HAVE_NETDB_H)
|
|
IF(HAVE_NETDB_H)
|
|
ADD_DEFINITIONS(-DHAVE_NETDB_H)
|
|
ENDIF(HAVE_NETDB_H)
|
|
|
|
IF(WIN32)
|
|
SET(MAYBE_STATIC_ONLY STATIC_ONLY)
|
|
ENDIF(WIN32)
|
|
|
|
MYSQL_ADD_PLUGIN(FEEDBACK ${FEEDBACK_SOURCES}
|
|
LINK_LIBRARIES ${SSL_LIBRARIES}
|
|
${MAYBE_STATIC_ONLY} RECOMPILE_FOR_EMBEDDED DEFAULT)
|
|
|