Skip to content

Commit f76da7f

Browse files
MDEV-27474 Spider: remove #WITH_PARTITION_STORAGE_ENGINE
"#ifdef WITH_PARTITION_STORAGE_ENGINE ... #endif" appears frequently in the Spider code base. However, there is no need to maintain such ifdefs because Spider is disabled if the partitioning engine is disabled.
1 parent 3eb1e11 commit f76da7f

13 files changed

+1
-367
lines changed

storage/spider/CMakeLists.txt

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_HANDLERSOCKET")
2-
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_HANDLERSOCKET")
3-
41
IF(HAVE_WVLA)
52
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wno-vla")
63
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wno-vla")
@@ -20,25 +17,9 @@ SET(SPIDER_SOURCES
2017
spd_db_mysql.cc spd_group_by_handler.cc spd_db_include.cc
2118
)
2219

23-
IF(EXISTS ${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake)
24-
SET(CMAKE_CXX_FLAGS_DEBUG
25-
"${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR /Zi")
26-
SET(CMAKE_C_FLAGS_DEBUG
27-
"${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR /Zi")
28-
SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /MAP /MAPINFO:EXPORTS")
29-
INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake")
30-
31-
INCLUDE_DIRECTORIES(
32-
${CMAKE_SOURCE_DIR}/include
33-
${CMAKE_SOURCE_DIR}/sql
34-
${CMAKE_SOURCE_DIR}/regex)
35-
36-
MYSQL_STORAGE_ENGINE(SPIDER)
37-
ELSEIF(PLUGIN_PARTITION MATCHES "^NO$")
20+
IF(PLUGIN_PARTITION MATCHES "^NO$")
3821
MESSAGE(STATUS "Spider is skipped because partitioning is disabled")
3922
ELSE()
40-
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/spider/hs_client)
41-
4223
IF(DEB)
4324
SET(extra_options COMPONENT spider-engine)
4425
ELSE()

0 commit comments

Comments
 (0)