summaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2016-09-27 17:38:47 +0200
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2016-09-27 17:38:47 +0200
commit0e472236ce1e7da5f5916f712e29511fc1aade33 (patch)
treefe5e2052faa58c891bbd629c9ee24110d66a0674 /plugin
parente226276950497c0ec92b3bf71bc6c46ac4a779d4 (diff)
downloadmariadb-git-0e472236ce1e7da5f5916f712e29511fc1aade33.tar.gz
Make sure to recompile the feedback plugin for EMBEDDED
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.
Diffstat (limited to 'plugin')
-rw-r--r--plugin/feedback/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugin/feedback/CMakeLists.txt b/plugin/feedback/CMakeLists.txt
index a243ba07751..2103250e5a6 100644
--- a/plugin/feedback/CMakeLists.txt
+++ b/plugin/feedback/CMakeLists.txt
@@ -19,5 +19,5 @@ ENDIF(WIN32)
MYSQL_ADD_PLUGIN(FEEDBACK ${FEEDBACK_SOURCES}
LINK_LIBRARIES ${SSL_LIBRARIES}
- ${MAYBE_STATIC_ONLY} DEFAULT)
+ ${MAYBE_STATIC_ONLY} RECOMPILE_FOR_EMBEDDED DEFAULT)