diff --git a/storage/ctc/CMakeLists.txt b/storage/ctc/CMakeLists.txt index 90289c4afc2588f5b88ddd95fb53a19e164135c8..6703afce555fef71afed4525fee41cd18b061cb8 100644 --- a/storage/ctc/CMakeLists.txt +++ b/storage/ctc/CMakeLists.txt @@ -68,14 +68,14 @@ IF (WITH_CANTIAN) ${CTC_SOURCES} STORAGE_ENGINE MANDATORY - LINK_LIBRARIES libzecommon.so libzeclient.so libzeprotocol.so libprotobuf-c.a pcre2-8 ctc_proxy libcantian.so libmessage_queue.so + LINK_LIBRARIES libzecommon.so libzeclient.so libzeprotocol.so libprotobuf-c.a pcre2-8 ctc_proxy libcantian.so ) ELSEIF (NOT WITHOUT_CTC_STORAGE_ENGINE) MYSQL_ADD_PLUGIN(ctc ${CTC_SOURCES} STORAGE_ENGINE MODULE_ONLY - LINK_LIBRARIES libzecommon.so libzeclient.so libzeprotocol.so libprotobuf-c.a pcre2-8 ctc_proxy libcantian.so libmessage_queue.so + LINK_LIBRARIES libzecommon.so libzeclient.so libzeprotocol.so libprotobuf-c.a pcre2-8 ctc_proxy libcantian.so ) ENDIF () ELSE () diff --git a/storage/ctc/ctc_srv.h b/storage/ctc/ctc_srv.h index 6cd3b2eea57351ef3bcdf1665c98c2bc288f7b9f..9918bd9821a2a304205ead94befc0f4880a463a4 100644 --- a/storage/ctc/ctc_srv.h +++ b/storage/ctc/ctc_srv.h @@ -233,10 +233,6 @@ typedef struct { int err_code; } ctc_invalidate_broadcast_request; -typedef struct { - int result; -} mysql_init_lib_request; - typedef struct { bool is_key_null; // 该列数据是否为null uint8_t *left_key; // 指向索引查询条件的左值 @@ -348,7 +344,6 @@ enum CTC_FUNC_TYPE { CTC_FUNC_TYPE_GET_MAX_SESSIONS, CTC_FUNC_LOCK_INSTANCE, CTC_FUNC_UNLOCK_INSTANCE, - CTC_FUNC_INIT_MYSQL_LIB, CTC_FUNC_CHECK_TABLE_EXIST, CTC_FUNC_SEARCH_METADATA_SWITCH, CTC_FUNC_QUERY_SHM_USAGE, @@ -615,9 +610,6 @@ typedef struct en_ctcpart_scan_range { int srv_wait_instance_startuped(void); int ctc_alloc_inst_id(uint32_t *inst_id); int ctc_release_inst_id(uint32_t inst_id); -#ifdef WITH_CANTIAN -int init_mysql_lib(void); -#endif int ctc_open_table(ctc_handler_t *tch, const char *table_name, const char *user_name); int ctc_close_table(ctc_handler_t *tch); diff --git a/storage/ctc/ha_ctc.cc b/storage/ctc/ha_ctc.cc index e0844d8bdb92943ba484edbc91a508b22774365e..722771d9ad94a7b397819b2247236bc256607491 100644 --- a/storage/ctc/ha_ctc.cc +++ b/storage/ctc/ha_ctc.cc @@ -542,12 +542,6 @@ static int ctc_reg_instance() { CTC_START_TIMEOUT); sleep(1); } -#ifdef WITH_CANTIAN - ret = (ct_errno_t)init_mysql_lib(); - if (ret == CT_SUCCESS) { - ctc_log_system("[CTC_INIT]:ctc reg mysql proxy lib in cantian success"); - } -#endif return convert_ctc_error_code_to_mysql(ret); }