mirror of
https://github.com/MariaDB/server.git
synced 2025-10-31 02:46:29 +01:00
1ff476b415
with C/C. The patch introduces mariadb_capi_rename.h which is included into mysql.h. The hew header contains macro definitions for the names being renamed. In versions 10.6+(i.e. where sql service exists) the renaming condition in the mariadb_capi_rename.h should be added with && !defined(MYSQL_DYNAMIC_PLUGIN) and look like The patch also contains removal of mysql.h from the api check. Disabling false_duper-6543 test for embedded. ha_federated.so uses C API. C API functions are being renamed in the server, but not renamed in embedded, since embedded server library should have proper C API, as expected by programs using it. Thus the same ha_federated.so cannot work both for server and embedded server library. As all federated tests are already disabled for embedded, federated isn't supposed to work for embedded anyway, and thus the test is being disabled.
22 lines
655 B
CMake
22 lines
655 B
CMake
INCLUDE(CheckCCompilerFlag)
|
|
|
|
ADD_DEFINITIONS(-DMYSQL_SERVER)
|
|
|
|
MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-write-strings")
|
|
|
|
IF(MSVC)
|
|
# Temporarily disable "conversion from size_t .." warnings
|
|
IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
|
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267")
|
|
ENDIF()
|
|
# Disable warning about deprecated functions, inet_aton
|
|
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996")
|
|
STRING(REPLACE "/permissive-" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" )
|
|
ENDIF()
|
|
|
|
IF(MSVC)
|
|
LINK_LIBRARIES(ws2_32)
|
|
ENDIF(MSVC)
|
|
|
|
SET(SPHINX_SOURCES ha_sphinx.cc snippets_udf.cc)
|
|
MYSQL_ADD_PLUGIN(sphinx ${SPHINX_SOURCES} STORAGE_ENGINE RECOMPILE_FOR_EMBEDDED)
|