[Commits] 0e47223: Make sure to recompile the feedback plugin for EMBEDDED

Vicentiu Ciorbaru vicentiu at mariadb.org
Tue Sep 27 18:43:38 EEST 2016


revision-id: 0e472236ce1e7da5f5916f712e29511fc1aade33 (mariadb-10.1.17-29-g0e47223)
parent(s): e226276950497c0ec92b3bf71bc6c46ac4a779d4
author: Vicențiu Ciorbaru
committer: Vicențiu Ciorbaru
timestamp: 2016-09-27 17:38:47 +0200
message:

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.

---
 plugin/feedback/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/feedback/CMakeLists.txt b/plugin/feedback/CMakeLists.txt
index a243ba0..2103250 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)
 


More information about the commits mailing list