Skip to content

Commit c817fda

Browse files
MDEV-26912 Spider: Remove dead code related to Oracle OCI
Remove the dead-code, in Spider, which is related to the Spider's Oracle OCI support. The code has been disabled for a long time and it is unlikely that the code will be enabled.
1 parent 7c339a6 commit c817fda

File tree

180 files changed

+1
-42950
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+1
-42950
lines changed

storage/spider/CMakeLists.txt

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,9 @@ SET(SPIDER_SOURCES
1717
spd_param.cc spd_sys_table.cc spd_trx.cc spd_db_conn.cc spd_conn.cc
1818
spd_table.cc spd_direct_sql.cc spd_udf.cc spd_ping_table.cc
1919
spd_copy_tables.cc spd_i_s.cc spd_malloc.cc ha_spider.cc spd_udf.def
20-
spd_db_mysql.cc spd_db_oracle.cc spd_group_by_handler.cc spd_db_include.cc
20+
spd_db_mysql.cc spd_group_by_handler.cc spd_db_include.cc
2121
)
2222

23-
IF(DEFINED ENV{ORACLE_HOME})
24-
SET(ORACLE_HOME $ENV{ORACLE_HOME})
25-
FIND_PATH(ORACLE_INCLUDE_DIR oci.h PATHS ${ORACLE_HOME}/rdbms/public)
26-
SET(ORACLE_OCI_LIB_NAME clntsh)
27-
SET(ORACLE_LIB_DIR ${ORACLE_HOME}/lib)
28-
FIND_LIBRARY(ORACLE_OCI_LIBRARY NAMES ${ORACLE_OCI_LIB_NAME} PATHS ${ORACLE_LIB_DIR})
29-
ENDIF()
30-
3123
IF(EXISTS ${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake)
3224
SET(CMAKE_CXX_FLAGS_DEBUG
3325
"${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR /Zi")
@@ -60,16 +52,6 @@ ELSE()
6052
ENDIF()
6153
ENDIF()
6254

63-
IF(ORACLE_INCLUDE_DIR AND ORACLE_OCI_LIBRARY)
64-
SET(SPIDER_WITH_ORACLE_OCI OFF CACHE BOOL "Spider is compiled with Oracle OCI library.")
65-
IF(SPIDER_WITH_ORACLE_OCI)
66-
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_ORACLE_OCI -DLINUX -D_GNU_SOURCE -D_REENTRANT")
67-
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_ORACLE_OCI -DLINUX -D_GNU_SOURCE -D_REENTRANT")
68-
INCLUDE_DIRECTORIES(${ORACLE_INCLUDE_DIR})
69-
TARGET_LINK_LIBRARIES (spider ${ORACLE_OCI_LIBRARY})
70-
ENDIF()
71-
ENDIF()
72-
7355
IF(MSVC AND (TARGET spider))
7456
IF (CMAKE_BUILD_TYPE STREQUAL "Debug")
7557
ADD_CUSTOM_COMMAND(TARGET spider

storage/spider/mysql-test/spider/oracle/include/deinit_child2_1.inc

Whitespace-only changes.

storage/spider/mysql-test/spider/oracle/include/deinit_child2_2.inc

Whitespace-only changes.

storage/spider/mysql-test/spider/oracle/include/deinit_child2_3.inc

Whitespace-only changes.

storage/spider/mysql-test/spider/oracle/include/deinit_child3_1.inc

Lines changed: 0 additions & 3 deletions
This file was deleted.

storage/spider/mysql-test/spider/oracle/include/deinit_child3_2.inc

Lines changed: 0 additions & 3 deletions
This file was deleted.

storage/spider/mysql-test/spider/oracle/include/deinit_child3_3.inc

Lines changed: 0 additions & 3 deletions
This file was deleted.

storage/spider/mysql-test/spider/oracle/include/deinit_master_1.inc

Lines changed: 0 additions & 1 deletion
This file was deleted.

storage/spider/mysql-test/spider/oracle/include/deinit_slave1_1.inc

Whitespace-only changes.

storage/spider/mysql-test/spider/oracle/include/ha_deinit_child2_1.inc

Whitespace-only changes.

storage/spider/mysql-test/spider/oracle/include/ha_deinit_child2_2.inc

Whitespace-only changes.

storage/spider/mysql-test/spider/oracle/include/ha_deinit_child2_3.inc

Whitespace-only changes.

storage/spider/mysql-test/spider/oracle/include/ha_deinit_child3_1.inc

Lines changed: 0 additions & 1 deletion
This file was deleted.

storage/spider/mysql-test/spider/oracle/include/ha_deinit_child3_2.inc

Lines changed: 0 additions & 1 deletion
This file was deleted.

storage/spider/mysql-test/spider/oracle/include/ha_deinit_child3_3.inc

Lines changed: 0 additions & 1 deletion
This file was deleted.

storage/spider/mysql-test/spider/oracle/include/ha_deinit_master_1.inc

Whitespace-only changes.

storage/spider/mysql-test/spider/oracle/include/ha_init_child2_1.inc

Lines changed: 0 additions & 8 deletions
This file was deleted.

storage/spider/mysql-test/spider/oracle/include/ha_init_child2_2.inc

Lines changed: 0 additions & 4 deletions
This file was deleted.

storage/spider/mysql-test/spider/oracle/include/ha_init_child2_3.inc

Lines changed: 0 additions & 4 deletions
This file was deleted.

storage/spider/mysql-test/spider/oracle/include/ha_init_child3_1.inc

Lines changed: 0 additions & 140 deletions
This file was deleted.

storage/spider/mysql-test/spider/oracle/include/ha_init_child3_2.inc

Lines changed: 0 additions & 140 deletions
This file was deleted.

0 commit comments

Comments
 (0)