diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index e946f0f..974bb52 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -115,7 +115,7 @@ MACRO(MYSQL_ADD_PLUGIN) # Build either static library or module IF (WITH_${plugin} AND NOT ARG_MODULE_ONLY) ADD_LIBRARY(${target} STATIC ${SOURCES}) - SET_TARGET_PROPERTIES(${target} PROPERTIES COMPILE_DEFINITONS "MYSQL_SERVER") + SET_TARGET_PROPERTIES(${target} PROPERTIES COMPILE_DEFINITIONS "MYSQL_SERVER") DTRACE_INSTRUMENT(${target}) ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDENCIES}) IF(WITH_EMBEDDED_SERVER) diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt index a5fffac..0e762a8 100644 --- a/storage/innobase/CMakeLists.txt +++ b/storage/innobase/CMakeLists.txt @@ -280,3 +280,6 @@ MYSQL_ADD_PLUGIN(innobase ${INNOBASE_SOURCES} STORAGE_ENGINE DEFAULT MODULE_OUTPUT_NAME ha_innodb LINK_LIBRARIES ${ZLIB_LIBRARY}) + +# Remove -DMYSQL_SERVER, it breaks embedded build +SET_TARGET_PROPERTIES(innobase PROPERTIES COMPILE_DEFINITIONS "")